From 26caa265b7eae49767947e1ff4e6cfc8166b07f5 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Sun, 9 Apr 2023 01:08:26 +0200 Subject: clean up GT++ code (#589) * yeet big reactor support * yeet IC2 classic support * yeet pneumaticraft support * yeet More Planets support * yeet Immersive Engineering support * yeet Psychedilicraft support * yeet Beyond Reality Core support * sort mods to see what must be purged * yeet simply jetpacks * yeet RFTools * yeet xReliquary * yeet RedTech * yeet Mekanism * yeet GrowthCraft * yeet ihl * leftover cleaning * yeet thermal fondation support * yeet compact windmills support * spotless * remove constants from LoadedMods (part 1 / 2) * spotless * remove constants from LoadedMods (part 2 / 2) * use mod id enum instead of strings + optimize imports * Loaded.isModLoaded -> enum * restore RA init * missing ! * start organizing recipes stuff * fix crash on world load in dev * remove unused class * remove HazmatUtils.java * move all the removals * remove enableHarderRecipesForHighTierCasings and usages(disabled in the pack) * move some pyrolyse oven recipes to its own file * sa * bump GT version * bump GT5U version * spotless apply * use Everglades entry from the mod enum --------- Co-authored-by: miozune Co-authored-by: Martin Robertz --- .../java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java | 4 +++- .../gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java | 4 +++- .../gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java | 5 +++-- .../java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java | 7 ++++++- 4 files changed, 15 insertions(+), 5 deletions(-) (limited to 'src/main/java/gtPlusPlus/everglades/block') diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java index 0d3b59e166..a91ed0cd84 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java @@ -1,5 +1,7 @@ package gtPlusPlus.everglades.block; +import static gregtech.api.enums.Mods.Minecraft; + import net.minecraft.block.BlockGrass; import gtPlusPlus.api.interfaces.ITileTooltip; @@ -11,7 +13,7 @@ public class BlockDarkWorldGround extends BlockGrass implements ITileTooltip { this.setCreativeTab(AddToCreativeTab.tabBOP); this.setBlockName("blockDarkWorldGround"); this.setHardness(1.0F); - this.setBlockTextureName("minecraft" + ":" + "grass"); + this.setBlockTextureName(Minecraft.ID + ":" + "grass"); } @Override diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java index 7590af19ef..43bb2ecac0 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java @@ -1,5 +1,7 @@ package gtPlusPlus.everglades.block; +import static gregtech.api.enums.Mods.Minecraft; + import net.minecraft.block.BlockDirt; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; @@ -15,7 +17,7 @@ public class BlockDarkWorldPollutedDirt extends BlockDirt implements ITileToolti this.setCreativeTab(AddToCreativeTab.tabBOP); this.setBlockName("blockDarkWorldGround2"); this.setHardness(0.5F); - this.setBlockTextureName("minecraft" + ":" + "dirt"); + this.setBlockTextureName(Minecraft.ID + ":" + "dirt"); } @Override diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java index e034d3e09e..1f8b82e9ca 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java @@ -1,11 +1,12 @@ package gtPlusPlus.everglades.block; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class BlockDarkWorldPortalFrame extends Block implements ITileTooltip { @@ -15,7 +16,7 @@ public class BlockDarkWorldPortalFrame extends Block implements ITileTooltip { this.setBlockName("blockDarkWorldPortalFrame"); this.setHardness(3.0F); this.setLightLevel(0.5F); - this.setBlockTextureName(CORE.MODID + ":" + "metro/TEXTURE_TECH_PANEL_A"); + this.setBlockTextureName(GTPlusPlus.ID + ":" + "metro/TEXTURE_TECH_PANEL_A"); } @Override diff --git a/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java b/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java index 66e03d8a77..4e1ca32dd0 100644 --- a/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java +++ b/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java @@ -1,6 +1,11 @@ package gtPlusPlus.everglades.block; -import static gtPlusPlus.everglades.dimension.Dimension_Everglades.*; +import static gtPlusPlus.everglades.dimension.Dimension_Everglades.blockFluidLakes; +import static gtPlusPlus.everglades.dimension.Dimension_Everglades.blockPortalFrame; +import static gtPlusPlus.everglades.dimension.Dimension_Everglades.blockSecondLayer; +import static gtPlusPlus.everglades.dimension.Dimension_Everglades.blockTopLayer; +import static gtPlusPlus.everglades.dimension.Dimension_Everglades.portalBlock; +import static gtPlusPlus.everglades.dimension.Dimension_Everglades.portalItem; import net.minecraft.init.Blocks; import net.minecraftforge.fluids.FluidRegistry; -- cgit