diff --git a/src/main/generated/assets/galacticraft/lang/en_us.json b/src/main/generated/assets/galacticraft/lang/en_us.json index f61dcb067..a708e69e5 100644 --- a/src/main/generated/assets/galacticraft/lang/en_us.json +++ b/src/main/generated/assets/galacticraft/lang/en_us.json @@ -11,9 +11,9 @@ "biome.galacticraft.venus_valley": "Venus Valley", "block.galacticraft.advanced_solar_panel": "Advanced Solar Panel", "block.galacticraft.advanced_solar_panel.description": "Advanced Solar Panels collect energy from the sun, and store it for further use. Adjusts position to face the sun, to collect more electricity.", - "block.galacticraft.air_lock_controller": "Air Lock Controller", - "block.galacticraft.air_lock_frame": "Air Lock Frame", - "block.galacticraft.air_lock_seal": "Air Lock Seal", + "block.galacticraft.air_lock_controller": "Airlock Controller", + "block.galacticraft.air_lock_frame": "Airlock Frame", + "block.galacticraft.air_lock_seal": "Airlock Seal", "block.galacticraft.aluminum_block": "Block of Aluminum", "block.galacticraft.aluminum_decoration": "Aluminum Decoration", "block.galacticraft.aluminum_decoration_slab": "Aluminum Decoration Slab", @@ -178,7 +178,7 @@ "block.galacticraft.moon_basalt_stairs": "Moon Basalt Stairs", "block.galacticraft.moon_basalt_wall": "Moon Basalt Wall", "block.galacticraft.moon_cheese_wheel": "Moon Cheese Wheel", - "block.galacticraft.moon_cheese_wheel.description": "Cheese Blocks are created from the cheeses of the Moon, place-able and edible.", + "block.galacticraft.moon_cheese_wheel.description": "Moon Cheese Wheels are created from the cheeses of the Moon, place-able and edible.", "block.galacticraft.moon_copper_ore": "Moon Copper Ore", "block.galacticraft.moon_dirt": "Moon Dirt", "block.galacticraft.moon_dirt_path": "Moon Dirt Path", @@ -567,7 +567,7 @@ "ui.galacticraft.booster": "Booster", "ui.galacticraft.bubble_distributor.current_size": "Current Size: %s", "ui.galacticraft.bubble_distributor.not_visible": "Bubble Not Visible", - "ui.galacticraft.bubble_distributor.size": "Target Size:", + "ui.galacticraft.bubble_distributor.size": "Target Size: ", "ui.galacticraft.bubble_distributor.visible": "Bubble Visible", "ui.galacticraft.celestialselection.apply": "Apply", "ui.galacticraft.celestialselection.assign_name": "Assign Name", @@ -599,7 +599,7 @@ "ui.galacticraft.giant_leap": "Taking one giant leap", "ui.galacticraft.machine.collecting": "Collecting: %s/s", "ui.galacticraft.machine.current_oxygen": "Oxygen: %s", - "ui.galacticraft.machine.gj_per_t": "%sGj/t", + "ui.galacticraft.machine.gj_per_t": "%s gJ/t", "ui.galacticraft.machine.max_oxygen": "Maximum Oxygen: %s", "ui.galacticraft.machine.solar_panel.atmospheric_interference": "Atmospheric Interference: %s", "ui.galacticraft.machine.solar_panel.blocked": "Blocked", @@ -618,7 +618,7 @@ "ui.galacticraft.machine.status": "Status: ", "ui.galacticraft.player_inv_screen.oxygen_tank_level": "Oxygen Tank %s: %s/%s", "ui.galacticraft.prepare_for_entry": "Prepare for entry!", - "ui.galacticraft.rocket.fuel": "Fuel:", + "ui.galacticraft.rocket.fuel": "Fuel: ", "ui.galacticraft.rocket.full": "% full", "ui.galacticraft.rocket.no_fuel": "No fuel", "ui.galacticraft.satellite": "Satellite", @@ -661,16 +661,16 @@ "ui.galacticraft.status.missing_oxygen_tank": "Missing Oxygen Tank", "ui.galacticraft.status.night": "Night", "ui.galacticraft.status.no_fuel": "No Fuel", - "ui.galacticraft.status.no_rocket": "No rocket", - "ui.galacticraft.status.not_enough_fuel": "Not enough fuel", + "ui.galacticraft.status.no_rocket": "No Rocket", + "ui.galacticraft.status.not_enough_fuel": "Not Enough Fuel", "ui.galacticraft.status.not_enough_oxygen": "Not Enough Oxygen", "ui.galacticraft.status.oxygen_tank_full": "Oxygen Tank Full", "ui.galacticraft.status.partially_blocked": "Partially Blocked", "ui.galacticraft.status.rain": "Rain", - "ui.galacticraft.status.rocket_is_full": "Rocket is full", + "ui.galacticraft.status.rocket_is_full": "Rocket Is Full", "ui.galacticraft.status.sealed": "Sealed", - "ui.galacticraft.status.warming_up": "Warming up", - "ui.galacticraft.travelling_to": "Travelling to: ", + "ui.galacticraft.status.warming_up": "Warming Up", + "ui.galacticraft.travelling_to": "Traveling to: ", "ui.galacticraft.upgrade": "Upgrade", "ui.lander.velocity": "Entry Velocity", "ui.lander.velocityu": "m/s", diff --git a/src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/AdvancedSolarPanelScreen.java b/src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/AdvancedSolarPanelScreen.java index 1c0749400..356e14afe 100644 --- a/src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/AdvancedSolarPanelScreen.java +++ b/src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/AdvancedSolarPanelScreen.java @@ -22,27 +22,16 @@ package dev.galacticraft.mod.client.gui.screen.ingame; -import dev.galacticraft.mod.Constant; import dev.galacticraft.mod.content.block.entity.machine.AdvancedSolarPanelBlockEntity; import dev.galacticraft.mod.screen.SolarPanelMenu; -import dev.galacticraft.mod.util.Translations; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -import java.util.List; - @Environment(EnvType.CLIENT) public class AdvancedSolarPanelScreen extends SolarPanelScreen> { public AdvancedSolarPanelScreen(SolarPanelMenu handler, Inventory inv, Component title) { super(handler, inv, title); } - - @Override - public void appendEnergyTooltip(List list) { - if (this.menu.state.isActive()) { - list.add(Component.translatable(Translations.Ui.GJT, this.menu.getCurrentEnergyGeneration()).setStyle(Constant.Text.Color.LIGHT_PURPLE_STYLE)); - } - } } diff --git a/src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/AirlockControllerScreen.java b/src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/AirlockControllerScreen.java index 68f858a11..00f40f40b 100644 --- a/src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/AirlockControllerScreen.java +++ b/src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/AirlockControllerScreen.java @@ -57,7 +57,7 @@ protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, in @Override protected void renderLabels(GuiGraphics graphics, int i, int j) { - graphics.drawString(this.font, Component.literal(Minecraft.getInstance().player.getGameProfile().getName() + "'s Air Lock Controller"), this.titleLabelX, this.titleLabelY, 4210752, false); + graphics.drawString(this.font, Component.literal(Minecraft.getInstance().player.getGameProfile().getName() + "'s Airlock Controller"), this.titleLabelX, this.titleLabelY, 4210752, false); } @Override diff --git a/src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/BasicSolarPanelScreen.java b/src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/BasicSolarPanelScreen.java index 58a3333b0..09291516c 100644 --- a/src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/BasicSolarPanelScreen.java +++ b/src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/BasicSolarPanelScreen.java @@ -22,27 +22,16 @@ package dev.galacticraft.mod.client.gui.screen.ingame; -import dev.galacticraft.mod.Constant; import dev.galacticraft.mod.content.block.entity.machine.BasicSolarPanelBlockEntity; import dev.galacticraft.mod.screen.SolarPanelMenu; -import dev.galacticraft.mod.util.Translations; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -import java.util.List; - @Environment(EnvType.CLIENT) public class BasicSolarPanelScreen extends SolarPanelScreen> { public BasicSolarPanelScreen(SolarPanelMenu handler, Inventory inv, Component title) { super(handler, inv, title); } - - @Override - public void appendEnergyTooltip(List list) { - if (this.menu.state.isActive()) { - list.add(Component.translatable(Translations.Ui.GJT, this.menu.getCurrentEnergyGeneration()).setStyle(Constant.Text.Color.LIGHT_PURPLE_STYLE)); - } - } } diff --git a/src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/SolarPanelScreen.java b/src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/SolarPanelScreen.java index d50b4b17d..a713fe17b 100644 --- a/src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/SolarPanelScreen.java +++ b/src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/SolarPanelScreen.java @@ -159,6 +159,7 @@ private void drawNormal(GuiGraphics graphics, int x, int y, int normalU, int nor @Override public void appendEnergyTooltip(List list) { + super.appendEnergyTooltip(list); if (this.menu.state.isActive()) { list.add(Component.translatable(Translations.Ui.GJT, this.menu.getCurrentEnergyGeneration()).setStyle(Constant.Text.Color.LIGHT_PURPLE_STYLE)); } diff --git a/src/main/java/dev/galacticraft/mod/content/block/entity/AirlockControllerBlockEntity.java b/src/main/java/dev/galacticraft/mod/content/block/entity/AirlockControllerBlockEntity.java index 108249638..40b627a0e 100644 --- a/src/main/java/dev/galacticraft/mod/content/block/entity/AirlockControllerBlockEntity.java +++ b/src/main/java/dev/galacticraft/mod/content/block/entity/AirlockControllerBlockEntity.java @@ -392,7 +392,7 @@ public void unsealAirLock() @Override public Component getDisplayName() { - return Component.literal(ownerName + "'s Air Lock Controller"); + return Component.literal(ownerName + "'s Airlock Controller"); } @Override diff --git a/src/main/java/dev/galacticraft/mod/content/entity/orbital/lander/LanderEntity.java b/src/main/java/dev/galacticraft/mod/content/entity/orbital/lander/LanderEntity.java index 1420285ea..119aa4f95 100644 --- a/src/main/java/dev/galacticraft/mod/content/entity/orbital/lander/LanderEntity.java +++ b/src/main/java/dev/galacticraft/mod/content/entity/orbital/lander/LanderEntity.java @@ -240,7 +240,7 @@ public void onGroundHit() { entity.setDeltaMovement(Vec3.ZERO); entity.setPos(entity.getX(), this.getY() + 2.25, entity.getZ()); } - this.level().explode(this, this.getX(), this.getY(), this.getZ(), 12, true, Level.ExplosionInteraction.MOB); + this.level().explode(this, this.getX(), this.getY(), this.getZ(), 12, false, Level.ExplosionInteraction.MOB); discard(); } diff --git a/src/main/java/dev/galacticraft/mod/content/teleporters/LanderCelestialTeleporterType.java b/src/main/java/dev/galacticraft/mod/content/teleporters/LanderCelestialTeleporterType.java index b27ad181d..1fb782b47 100644 --- a/src/main/java/dev/galacticraft/mod/content/teleporters/LanderCelestialTeleporterType.java +++ b/src/main/java/dev/galacticraft/mod/content/teleporters/LanderCelestialTeleporterType.java @@ -40,10 +40,10 @@ public LanderCelestialTeleporterType(Codec codec) { @Override public void onEnterAtmosphere(ServerLevel level, ServerPlayer player, CelestialBody body, CelestialBody fromBody, Config config) { + player.teleportTo(level, player.getX(), 1100, player.getZ(), player.getYRot(), player.getXRot()); LanderEntity lander = new LanderEntity(player); level.addFreshEntity(lander); lander.setPos(player.getX(), 1100, player.getZ()); - player.teleportTo(level, player.getX(), 1100, player.getZ(), player.getYRot(), player.getXRot()); player.startRiding(lander, true); } } diff --git a/src/main/java/dev/galacticraft/mod/data/GCTranslationProvider.java b/src/main/java/dev/galacticraft/mod/data/GCTranslationProvider.java index 428428147..86ab35caf 100644 --- a/src/main/java/dev/galacticraft/mod/data/GCTranslationProvider.java +++ b/src/main/java/dev/galacticraft/mod/data/GCTranslationProvider.java @@ -27,8 +27,10 @@ import dev.galacticraft.mod.content.GCBlocks; import dev.galacticraft.mod.content.GCEntityTypes; import dev.galacticraft.mod.content.GCRocketParts; +import dev.galacticraft.mod.content.GCBlockRegistry.DecorationSet; import dev.galacticraft.mod.content.entity.damage.GCDamageTypes; import dev.galacticraft.mod.content.item.GCItems; +import dev.galacticraft.mod.world.biome.GCBiomes; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.minecraft.core.HolderLookup; import net.minecraft.resources.ResourceKey; @@ -48,41 +50,206 @@ public GCTranslationProvider(FabricDataOutput output, CompletableFuture