diff --git a/README.md b/README.md index 107e4c17..fe133785 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ - Allow refreshing of GregTech CEu recycling recipes at any time, allowing for these to be changed with GroovyScript's reload feature - More planned! - Configs, allowing for disabling of different features, allowing for a wider range of usage -- More to come, such as custom GT content, improved custom multiblocks, new multiblocks (a greenhouse, which alllows for better automation of plant-related materials over EIO Farmers, is already available), and more custom textures! +- More to come, such as custom GT content, improved custom multiblocks, new multiblocks (a growth chamber, which allows for better automation of plant-related materials over EIO Farmers, is already available), and more custom textures! ## Translations Translations are offered for Nomi Labs, in a separate 'language pack'. This is available to download [here](https://nightly.link/Nomi-CEu/Nomi-CEu-Translations/workflows/pushbuildpack/main?preview) (download the 'nomi-labs' zip for Nomi Labs). diff --git a/src/main/groovy-tests/jeiTests.groovy b/src/main/groovy-tests/jeiTests.groovy index 74b1a7cd..43f0f882 100644 --- a/src/main/groovy-tests/jeiTests.groovy +++ b/src/main/groovy-tests/jeiTests.groovy @@ -43,7 +43,7 @@ println('Translatable Object: ' + translatableObj.translate()) addDescription(item('minecraft:apple'), translatableLiteral('An Ordinary Apple... Not Poisoned.').addFormat(TextFormatting.DARK_GREEN), translatableLiteral('Eat it!')) // Add a translated description page for a stack -addDescription(item('minecraft:iron_ingot'), translatable('tooltip.nomilabs.greenhouse.description'), translatable('tooltip.nomilabs.dme_sim_chamber.description')) +addDescription(item('minecraft:iron_ingot'), translatable('tooltip.nomilabs.growth_chamber.description'), translatable('tooltip.nomilabs.dme_sim_chamber.description')) /* * Recipe Output Tooltips. These are tooltips that appear on CRAFTING TABLE recipes that output that stack. @@ -58,10 +58,10 @@ addDescription(item('minecraft:iron_ingot'), translatable('tooltip.nomilabs.gree addRecipeOutputTooltip(item('minecraft:gold_ingot'), translatableLiteral('A Very Low Carrot Gold Ingot.').addFormat(TextFormatting.GOLD)) // Add a translated crafting recipe output tooltip for a stack -addRecipeOutputTooltip(item('minecraft:iron_ingot'), translatable('tooltip.nomilabs.greenhouse.description'), translatable('tooltip.nomilabs.dme_sim_chamber.description')) +addRecipeOutputTooltip(item('minecraft:iron_ingot'), translatable('tooltip.nomilabs.growth_chamber.description'), translatable('tooltip.nomilabs.dme_sim_chamber.description')) // Add a crafting recipe output tooltip for a specific recipe for a stack (Higher Priority than wild recipe name) addRecipeOutputTooltip(item('minecraft:gold_ingot'), resource('minecraft:gold_ingot_from_block'), translatableLiteral('A Very High Carrot Gold Ingot.').addFormat(TextFormatting.GOLD)) // Add a translated crafting recipe output tooltip for a specific recipe for a stack (Higher Priority than wild recipe name) -addRecipeOutputTooltip(item('minecraft:iron_ingot'), resource('minecraft:iron_ingot_from_nuggets'), translatable('tooltip.nomilabs.universalnavigator.description'), translatable('tooltip.nomilabs.greenhouse.description'), translatable('tooltip.nomilabs.dme_sim_chamber.description')) +addRecipeOutputTooltip(item('minecraft:iron_ingot'), resource('minecraft:iron_ingot_from_nuggets'), translatable('tooltip.nomilabs.universalnavigator.description'), translatable('tooltip.nomilabs.growth_chamber.description'), translatable('tooltip.nomilabs.dme_sim_chamber.description')) diff --git a/src/main/java/com/nomiceu/nomilabs/gregtech/LabsTextures.java b/src/main/java/com/nomiceu/nomilabs/gregtech/LabsTextures.java index 017391c4..ca0e620c 100644 --- a/src/main/java/com/nomiceu/nomilabs/gregtech/LabsTextures.java +++ b/src/main/java/com/nomiceu/nomilabs/gregtech/LabsTextures.java @@ -9,7 +9,7 @@ public class LabsTextures { /* Overlays (Machine) */ - public static OrientedOverlayRenderer GREENHOUSE_OVERLAY; + public static OrientedOverlayRenderer GROWTH_CHAMBER_OVERLAY; /* Overlays (Casings) */ public static SimpleOverlayRenderer MICROVERSE_CASING; @@ -18,7 +18,7 @@ public class LabsTextures { public static TextureArea PROGRESS_BAR_ROCKET; public static void preInit() { - GREENHOUSE_OVERLAY = new OrientedOverlayRenderer("nomilabs:multiblock/greenhouse"); + GROWTH_CHAMBER_OVERLAY = new OrientedOverlayRenderer("nomilabs:multiblock/growth_chamber"); MICROVERSE_CASING = new SimpleOverlayRenderer("nomilabs:microverse_casing"); PROGRESS_BAR_ROCKET = labsFullImage("textures/gui/progress_bar/progress_bar_rocket.png"); } diff --git a/src/main/java/com/nomiceu/nomilabs/gregtech/metatileentity/multiblock/MetaTileEntityGrowthChamber.java b/src/main/java/com/nomiceu/nomilabs/gregtech/metatileentity/multiblock/MetaTileEntityGrowthChamber.java index a59dc495..31b23c7a 100755 --- a/src/main/java/com/nomiceu/nomilabs/gregtech/metatileentity/multiblock/MetaTileEntityGrowthChamber.java +++ b/src/main/java/com/nomiceu/nomilabs/gregtech/metatileentity/multiblock/MetaTileEntityGrowthChamber.java @@ -109,7 +109,7 @@ protected TraceabilityPredicate getCasingPredicatePipe() { @SideOnly(Side.CLIENT) @NotNull protected ICubeRenderer getFrontOverlay() { - return LabsTextures.GREENHOUSE_OVERLAY; + return LabsTextures.GROWTH_CHAMBER_OVERLAY; } @Override diff --git a/src/main/resources/assets/nomilabs/textures/blocks/multiblock/greenhouse/overlay_front.png b/src/main/resources/assets/nomilabs/textures/blocks/multiblock/growth_chamber/overlay_front.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/nomilabs/textures/blocks/multiblock/greenhouse/overlay_front.png rename to src/main/resources/assets/nomilabs/textures/blocks/multiblock/growth_chamber/overlay_front.png diff --git a/src/main/resources/assets/nomilabs/textures/blocks/multiblock/greenhouse/overlay_front_active.png b/src/main/resources/assets/nomilabs/textures/blocks/multiblock/growth_chamber/overlay_front_active.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/nomilabs/textures/blocks/multiblock/greenhouse/overlay_front_active.png rename to src/main/resources/assets/nomilabs/textures/blocks/multiblock/growth_chamber/overlay_front_active.png diff --git a/src/main/resources/assets/nomilabs/textures/blocks/multiblock/greenhouse/overlay_front_active.png.mcmeta b/src/main/resources/assets/nomilabs/textures/blocks/multiblock/growth_chamber/overlay_front_active.png.mcmeta similarity index 100% rename from src/main/resources/assets/nomilabs/textures/blocks/multiblock/greenhouse/overlay_front_active.png.mcmeta rename to src/main/resources/assets/nomilabs/textures/blocks/multiblock/growth_chamber/overlay_front_active.png.mcmeta diff --git a/src/main/resources/assets/nomilabs/textures/blocks/multiblock/greenhouse/overlay_front_active_emissive.png b/src/main/resources/assets/nomilabs/textures/blocks/multiblock/growth_chamber/overlay_front_active_emissive.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/nomilabs/textures/blocks/multiblock/greenhouse/overlay_front_active_emissive.png rename to src/main/resources/assets/nomilabs/textures/blocks/multiblock/growth_chamber/overlay_front_active_emissive.png diff --git a/src/main/resources/assets/nomilabs/textures/blocks/multiblock/greenhouse/overlay_front_emissive.png b/src/main/resources/assets/nomilabs/textures/blocks/multiblock/growth_chamber/overlay_front_emissive.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/nomilabs/textures/blocks/multiblock/greenhouse/overlay_front_emissive.png rename to src/main/resources/assets/nomilabs/textures/blocks/multiblock/growth_chamber/overlay_front_emissive.png diff --git a/src/main/resources/assets/nomilabs/textures/blocks/multiblock/greenhouse/overlay_front_paused.png b/src/main/resources/assets/nomilabs/textures/blocks/multiblock/growth_chamber/overlay_front_paused.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/nomilabs/textures/blocks/multiblock/greenhouse/overlay_front_paused.png rename to src/main/resources/assets/nomilabs/textures/blocks/multiblock/growth_chamber/overlay_front_paused.png diff --git a/src/main/resources/assets/nomilabs/textures/blocks/multiblock/greenhouse/overlay_front_paused_emissive.png b/src/main/resources/assets/nomilabs/textures/blocks/multiblock/growth_chamber/overlay_front_paused_emissive.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/nomilabs/textures/blocks/multiblock/greenhouse/overlay_front_paused_emissive.png rename to src/main/resources/assets/nomilabs/textures/blocks/multiblock/growth_chamber/overlay_front_paused_emissive.png