From 1b820de08a05070909a267e17f033fcf58ac8710 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 2 Sep 2024 23:17:17 +0200 Subject: The Great Renaming (#3014) * move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names --- src/functionalTest/java/kubatech/test/EIGTests.java | 17 ++++++++--------- .../java/kubatech/test/kubatechTestMod.java | 6 +++--- 2 files changed, 11 insertions(+), 12 deletions(-) (limited to 'src/functionalTest/java/kubatech/test') diff --git a/src/functionalTest/java/kubatech/test/EIGTests.java b/src/functionalTest/java/kubatech/test/EIGTests.java index 7cdfa8dae4..7ff95b168f 100644 --- a/src/functionalTest/java/kubatech/test/EIGTests.java +++ b/src/functionalTest/java/kubatech/test/EIGTests.java @@ -20,7 +20,7 @@ package kubatech.test; -import static gregtech.api.util.GT_RecipeBuilder.HOURS; +import static gregtech.api.util.GTRecipeBuilder.HOURS; import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; @@ -48,16 +48,16 @@ import net.minecraftforge.common.DimensionManager; import org.junit.jupiter.api.Test; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.common.blocks.GT_Item_Machines; +import gregtech.common.blocks.ItemMachines; import ic2.api.crops.CropCard; import ic2.api.crops.Crops; import ic2.core.Ic2Items; import ic2.core.crop.TileEntityCrop; import ic2.core.item.ItemCropSeed; import kubatech.api.eig.EIGDropTable; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse; +import kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse; import kubatech.tileentity.gregtech.multiblock.eigbuckets.EIGIC2Bucket; public class EIGTests { @@ -190,7 +190,7 @@ public class EIGTests { return expected; } - EIGDropTable getEIGDrops(GT_MetaTileEntity_ExtremeIndustrialGreenhouse EIG, ItemStack stack) { + EIGDropTable getEIGDrops(MTEExtremeIndustrialGreenhouse EIG, ItemStack stack) { EIGDropTable generated = new EIGDropTable(); EIGIC2Bucket bucket = new EIGIC2Bucket(stack, stack.stackSize, null, false); bucket.revalidate(EIG); @@ -208,7 +208,7 @@ public class EIGTests { TileEntityCrop cropTile = (TileEntityCrop) myWorld.getTileEntity(10, 81, 0); ItemStack ccStack = ItemCropSeed.generateItemStackFromValues(cc, (byte) 10, (byte) 10, (byte) 10, (byte) 1); - GT_Item_Machines itemMachines = (GT_Item_Machines) Item.getItemFromBlock(GregTech_API.sBlockMachines); + ItemMachines itemMachines = (ItemMachines) Item.getItemFromBlock(GregTechAPI.sBlockMachines); itemMachines.placeBlockAt( new ItemStack(itemMachines, 1, EIG_CONTROLLER_METADATA), null, @@ -222,8 +222,7 @@ public class EIGTests { 0, EIG_CONTROLLER_METADATA); IGregTechTileEntity te = (IGregTechTileEntity) myWorld.getTileEntity(0, 81, 0); - GT_MetaTileEntity_ExtremeIndustrialGreenhouse EIG = (GT_MetaTileEntity_ExtremeIndustrialGreenhouse) te - .getMetaTileEntity(); + MTEExtremeIndustrialGreenhouse EIG = (MTEExtremeIndustrialGreenhouse) te.getMetaTileEntity(); // update stats of crop TE to those provided by the EIG cropTile.humidity = EIGIC2Bucket.getHumidity(EIG, false); @@ -238,7 +237,7 @@ public class EIGTests { xyz[1] += te.getYCoord(); xyz[2] += te.getZCoord(); - myWorld.setBlock(xyz[0], xyz[1] - 2, xyz[2], GregTech_API.sBlockCasings4, 1, 0); + myWorld.setBlock(xyz[0], xyz[1] - 2, xyz[2], GregTechAPI.sBlockCasings4, 1, 0); myWorld.setBlock(xyz[0], xyz[1] - 1, xyz[2], Blocks.farmland, 0, 0); ItemStack stackToTest = null; diff --git a/src/functionalTest/java/kubatech/test/kubatechTestMod.java b/src/functionalTest/java/kubatech/test/kubatechTestMod.java index bc68d3f203..5f0225d0ee 100644 --- a/src/functionalTest/java/kubatech/test/kubatechTestMod.java +++ b/src/functionalTest/java/kubatech/test/kubatechTestMod.java @@ -25,7 +25,7 @@ import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartedEvent; -import gregtech.GT_Mod; +import gregtech.GTMod; @Mod( modid = "kubatech-tests", @@ -37,8 +37,8 @@ public class kubatechTestMod { @EventHandler public void preInit(FMLPreInitializationEvent ev) { // Disable GT5u messing with vanilla recipes for unit tests - GT_Mod.gregtechproxy.mNerfedWoodPlank = false; - GT_Mod.gregtechproxy.mNerfedVanillaTools = false; + GTMod.gregtechproxy.mNerfedWoodPlank = false; + GTMod.gregtechproxy.mNerfedVanillaTools = false; } @EventHandler -- cgit