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/main/java/kubatech/loaders/BlockLoader.java | 12 +- src/main/java/kubatech/loaders/DEFCRecipes.java | 166 ++++++++-------- src/main/java/kubatech/loaders/ItemLoader.java | 86 ++++---- .../java/kubatech/loaders/MobHandlerLoader.java | 14 +- src/main/java/kubatech/loaders/RecipeLoader.java | 103 +++++----- src/main/java/kubatech/loaders/TCLoader.java | 6 +- .../loaders/block/defc/BlockDEFCCasing.java | 63 ++++++ .../loaders/block/defc/DEFCCasingBlock.java | 63 ------ .../loaders/block/defc/DEFCCasingItemBlock.java | 36 ---- .../loaders/block/defc/ItemBlockDEFCCasing.java | 36 ++++ .../block/kubablock/blocks/BlockTeaAcceptor.java | 64 ++++++ .../block/kubablock/blocks/BlockTeaStorage.java | 66 +++++++ .../block/kubablock/blocks/TeaAcceptor.java | 64 ------ .../loaders/block/kubablock/blocks/TeaStorage.java | 66 ------- .../java/kubatech/loaders/item/items/ItemTea.java | 72 +++++++ .../loaders/item/items/ItemTeaCollection.java | 209 ++++++++++++++++++++ .../loaders/item/items/ItemTeaIngredient.java | 41 ++++ .../loaders/item/items/ItemTeaUltimate.java | 216 +++++++++++++++++++++ src/main/java/kubatech/loaders/item/items/Tea.java | 72 ------- .../kubatech/loaders/item/items/TeaCollection.java | 209 -------------------- .../kubatech/loaders/item/items/TeaIngredient.java | 41 ---- .../kubatech/loaders/item/items/TeaUltimate.java | 216 --------------------- 22 files changed, 960 insertions(+), 961 deletions(-) create mode 100644 src/main/java/kubatech/loaders/block/defc/BlockDEFCCasing.java delete mode 100644 src/main/java/kubatech/loaders/block/defc/DEFCCasingBlock.java delete mode 100644 src/main/java/kubatech/loaders/block/defc/DEFCCasingItemBlock.java create mode 100644 src/main/java/kubatech/loaders/block/defc/ItemBlockDEFCCasing.java create mode 100644 src/main/java/kubatech/loaders/block/kubablock/blocks/BlockTeaAcceptor.java create mode 100644 src/main/java/kubatech/loaders/block/kubablock/blocks/BlockTeaStorage.java delete mode 100644 src/main/java/kubatech/loaders/block/kubablock/blocks/TeaAcceptor.java delete mode 100644 src/main/java/kubatech/loaders/block/kubablock/blocks/TeaStorage.java create mode 100644 src/main/java/kubatech/loaders/item/items/ItemTea.java create mode 100644 src/main/java/kubatech/loaders/item/items/ItemTeaCollection.java create mode 100644 src/main/java/kubatech/loaders/item/items/ItemTeaIngredient.java create mode 100644 src/main/java/kubatech/loaders/item/items/ItemTeaUltimate.java delete mode 100644 src/main/java/kubatech/loaders/item/items/Tea.java delete mode 100644 src/main/java/kubatech/loaders/item/items/TeaCollection.java delete mode 100644 src/main/java/kubatech/loaders/item/items/TeaIngredient.java delete mode 100644 src/main/java/kubatech/loaders/item/items/TeaUltimate.java (limited to 'src/main/java/kubatech/loaders') diff --git a/src/main/java/kubatech/loaders/BlockLoader.java b/src/main/java/kubatech/loaders/BlockLoader.java index fcb077ff15..e2c94a0e4b 100644 --- a/src/main/java/kubatech/loaders/BlockLoader.java +++ b/src/main/java/kubatech/loaders/BlockLoader.java @@ -25,11 +25,11 @@ import net.minecraft.item.ItemBlock; import cpw.mods.fml.common.registry.GameRegistry; import kubatech.api.enums.ItemList; -import kubatech.loaders.block.defc.DEFCCasingBlock; +import kubatech.loaders.block.defc.BlockDEFCCasing; import kubatech.loaders.block.kubablock.KubaBlock; import kubatech.loaders.block.kubablock.KubaItemBlock; -import kubatech.loaders.block.kubablock.blocks.TeaAcceptor; -import kubatech.loaders.block.kubablock.blocks.TeaStorage; +import kubatech.loaders.block.kubablock.blocks.BlockTeaAcceptor; +import kubatech.loaders.block.kubablock.blocks.BlockTeaStorage; import kubatech.tileentity.TeaAcceptorTile; import kubatech.tileentity.TeaStorageTile; @@ -37,7 +37,7 @@ public class BlockLoader { public static final KubaBlock kubaBlock = new KubaBlock(Material.anvil); public static final ItemBlock kubaItemBlock = new KubaItemBlock(kubaBlock); - public static final DEFCCasingBlock defcCasingBlock = new DEFCCasingBlock(); + public static final BlockDEFCCasing defcCasingBlock = new BlockDEFCCasing(); public static void registerBlocks() { GameRegistry.registerTileEntity(TeaAcceptorTile.class, "KT_TeaAcceptor"); @@ -45,7 +45,7 @@ public class BlockLoader { GameRegistry.registerBlock(kubaBlock, null, "kubablocks"); GameRegistry.registerItem(kubaItemBlock, "kubablocks"); - ItemList.TeaAcceptor.set(kubaBlock.registerProxyBlock(new TeaAcceptor())); - ItemList.TeaStorage.set(kubaBlock.registerProxyBlock(new TeaStorage())); + ItemList.TeaAcceptor.set(kubaBlock.registerProxyBlock(new BlockTeaAcceptor())); + ItemList.TeaStorage.set(kubaBlock.registerProxyBlock(new BlockTeaStorage())); } } diff --git a/src/main/java/kubatech/loaders/DEFCRecipes.java b/src/main/java/kubatech/loaders/DEFCRecipes.java index ebea8d751f..37f13c1298 100644 --- a/src/main/java/kubatech/loaders/DEFCRecipes.java +++ b/src/main/java/kubatech/loaders/DEFCRecipes.java @@ -8,7 +8,7 @@ import static gregtech.api.enums.Mods.SuperSolarPanels; import static gregtech.api.enums.Mods.Witchery; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; -import static gregtech.api.util.GT_RecipeConstants.DEFC_CASING_TIER; +import static gregtech.api.util.GTRecipeConstants.DEFC_CASING_TIER; import java.util.Arrays; @@ -22,7 +22,7 @@ import com.gtnewhorizons.modularui.api.drawable.UITexture; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; @@ -31,12 +31,12 @@ import gregtech.api.enums.TierEU; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMapBackend; import gregtech.api.recipe.RecipeMapBuilder; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; import gregtech.nei.formatter.SimpleSpecialValueFormatter; -import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType; +import gtPlusPlus.xmod.forestry.bees.handler.GTPPCombType; import kubatech.Tags; public class DEFCRecipes { @@ -54,13 +54,13 @@ public class DEFCRecipes { public static void addRecipes() { // Dragonblood recipe for magics haters - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dragon_egg, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L)) .fluidInputs(Materials.Radon.getPlasma(144)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8L)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288)) .eut(TierEU.RECIPE_UHV) .duration(14_000) @@ -68,59 +68,59 @@ public class DEFCRecipes { // Casings - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 6L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 6L)) + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 6L), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 6L)) .fluidInputs(Materials.Void.getMolten(1152L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingBase.get(1)) .eut(TierEU.RECIPE_UV) .duration(24000) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "tile.BloodyIchorium", 1, 0), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 6L)) + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "tile.BloodyIchorium", 1, 0), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 6L)) .fluidInputs(Materials.Void.getMolten(1152L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT1.get(1)) .eut(TierEU.RECIPE_UV) .duration(24000) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( kubatech.api.enums.ItemList.DEFCCasingT1.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 6L), - GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0)) + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 6L), + GTModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0)) .fluidInputs(Materials.Void.getMolten(2304L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT2.get(1)) .eut(TierEU.RECIPE_UV) .duration(24000) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( kubatech.api.enums.ItemList.DEFCCasingT2.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6L), - GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 2, 0)) + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6L), + GTModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 2, 0)) .fluidInputs(Materials.Void.getMolten(4608L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT3.get(1)) .eut(TierEU.RECIPE_UHV) .duration(12000) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( kubatech.api.enums.ItemList.DEFCCasingT3.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 6L), - GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 3, 0)) + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 6L), + GTModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 3, 0)) .fluidInputs(Materials.Void.getMolten(9216L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT4.get(1)) .eut(TierEU.RECIPE_UEV) .duration(12000) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( kubatech.api.enums.ItemList.DEFCCasingT4.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6L), - GT_ModHandler.getModItem(DraconicEvolution.ID, "chaoticCore", 4, 0)) + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6L), + GTModHandler.getModItem(DraconicEvolution.ID, "chaoticCore", 4, 0)) .fluidInputs(Materials.Void.getMolten(18432L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT5.get(1)) .eut(TierEU.RECIPE_UIV) @@ -133,7 +133,7 @@ public class DEFCRecipes { private static final Item EMTItems = GameRegistry.findItem("EMT", "EMTItems"); - private static void addOldHiddenRecipe(GT_Recipe recipe) { + private static void addOldHiddenRecipe(GTRecipe recipe) { if (!ElectroMagicTools.isModLoaded()) return; recipe = recipe.copy(); recipe.mInputs = Arrays.stream(recipe.mInputs) @@ -169,29 +169,29 @@ public class DEFCRecipes { private static void fusionRecipes() { // CORES - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 4), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1), ItemList.QuantumEye.get(1L), kubatech.api.enums.ItemList.DEFCDraconicSchematic.get(0L)) .fluidInputs(Materials.Sunnarium.getMolten(1440)) - .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0)) + .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0)) .eut(TierEU.RECIPE_UV) .duration(400) .metadata(DEFC_CASING_TIER, 1) .addTo(fusionCraftingRecipes) .forEach(DEFCRecipes::addOldHiddenRecipe); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4), - GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 4, 0), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4), + GTModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 4, 0), ItemList.QuantumStar.get(1L), kubatech.api.enums.ItemList.DEFCWyvernSchematic.get(0L)) .fluidInputs(Materials.Neutronium.getMolten(1440)) - .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 1, 0)) + .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 1, 0)) .eut(TierEU.RECIPE_UHV) .duration(800) .metadata(DEFC_CASING_TIER, 2) @@ -199,30 +199,30 @@ public class DEFCRecipes { .forEach(DEFCRecipes::addOldHiddenRecipe); if (Loader.isModLoaded("supersolarpanel")) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4), - GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 4, 0), - GT_ModHandler.getModItem(SuperSolarPanels.ID, "enderquantumcomponent", 1, 0), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4), + GTModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 4, 0), + GTModHandler.getModItem(SuperSolarPanels.ID, "enderquantumcomponent", 1, 0), kubatech.api.enums.ItemList.DEFCAwakenedSchematic.get(0L)) .fluidInputs(Materials.Infinity.getMolten(1440)) - .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 1, 0)) + .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 1, 0)) .eut(TierEU.RECIPE_UEV) .duration(1600) .metadata(DEFC_CASING_TIER, 3) .addTo(fusionCraftingRecipes) .forEach(DEFCRecipes::addOldHiddenRecipe); } else { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4), - GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 4, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ManyullynCrystal", 1, 0), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4), + GTModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 4, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ManyullynCrystal", 1, 0), kubatech.api.enums.ItemList.DEFCAwakenedSchematic.get(0L)) .fluidInputs(Materials.Infinity.getMolten(1440)) - .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 1, 0)) + .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 1, 0)) .eut(TierEU.RECIPE_UEV) .duration(1600) .metadata(DEFC_CASING_TIER, 3) @@ -230,15 +230,15 @@ public class DEFCRecipes { .forEach(DEFCRecipes::addOldHiddenRecipe); } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 4), - GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 4, 0), - GT_ModHandler.getModItem(DraconicEvolution.ID, "chaosFragment", 2, 2), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 16), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 4), + GTModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 4, 0), + GTModHandler.getModItem(DraconicEvolution.ID, "chaosFragment", 2, 2), kubatech.api.enums.ItemList.DEFCChaoticSchematic.get(0L)) .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(1440)) - .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "chaoticCore", 1, 0)) + .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "chaoticCore", 1, 0)) .eut(24_000_000) .duration(3200) .metadata(DEFC_CASING_TIER, 4) @@ -247,28 +247,28 @@ public class DEFCRecipes { // ENERGY CORES - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 4), - GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 4, 1), - GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 4), + GTModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 4, 1), + GTModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0), kubatech.api.enums.ItemList.DEFCWyvernSchematic.get(0L)) - .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 1, 0)) + .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 1, 0)) .eut(TierEU.RECIPE_UV) .duration(1000) .metadata(DEFC_CASING_TIER, 2) .addTo(fusionCraftingRecipes) .forEach(DEFCRecipes::addOldHiddenRecipe); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 8), - GT_ModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 4, 0), - GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 4, 4), - GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 1, 0), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 8), + GTModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 4, 0), + GTModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 4, 4), + GTModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 1, 0), kubatech.api.enums.ItemList.DEFCAwakenedSchematic.get(0L)) - .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 1, 1)) + .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 1, 1)) .eut(TierEU.RECIPE_UHV) .duration(2000) .metadata(DEFC_CASING_TIER, 3) @@ -276,11 +276,11 @@ public class DEFCRecipes { .forEach(DEFCRecipes::addOldHiddenRecipe); // Dragon Blood - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dragon_egg, 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Radon.getPlasma(144)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288)) .eut(TierEU.RECIPE_UHV) @@ -289,11 +289,11 @@ public class DEFCRecipes { .noOptimize() .addTo(fusionCraftingRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem(Witchery.ID, "infinityegg", 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - GT_Utility.getIntegratedCircuit(1)) + GTModHandler.getModItem(Witchery.ID, "infinityegg", 0), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Radon.getPlasma(72)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432)) .eut(TierEU.RECIPE_UHV) @@ -302,11 +302,11 @@ public class DEFCRecipes { .noOptimize() .addTo(fusionCraftingRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dragon_egg, 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - GTPP_CombType.DRAGONBLOOD.getStackForType(1)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GTPPCombType.DRAGONBLOOD.getStackForType(1)) .fluidInputs(Materials.Radon.getPlasma(216)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432)) .eut(TierEU.RECIPE_UHV) @@ -315,11 +315,11 @@ public class DEFCRecipes { .noOptimize() .addTo(fusionCraftingRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem(Witchery.ID, "infinityegg", 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - GTPP_CombType.DRAGONBLOOD.getStackForType(1)) + GTModHandler.getModItem(Witchery.ID, "infinityegg", 0), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GTPPCombType.DRAGONBLOOD.getStackForType(1)) .fluidInputs(Materials.Radon.getPlasma(108)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 648)) .eut(TierEU.RECIPE_UHV) diff --git a/src/main/java/kubatech/loaders/ItemLoader.java b/src/main/java/kubatech/loaders/ItemLoader.java index d8218ea873..a7d37da63a 100644 --- a/src/main/java/kubatech/loaders/ItemLoader.java +++ b/src/main/java/kubatech/loaders/ItemLoader.java @@ -73,10 +73,10 @@ import net.minecraft.util.StatCollector; import cpw.mods.fml.common.registry.GameRegistry; import kubatech.loaders.item.ItemProxy; import kubatech.loaders.item.KubaItems; -import kubatech.loaders.item.items.Tea; -import kubatech.loaders.item.items.TeaCollection; -import kubatech.loaders.item.items.TeaIngredient; -import kubatech.loaders.item.items.TeaUltimate; +import kubatech.loaders.item.items.ItemTea; +import kubatech.loaders.item.items.ItemTeaCollection; +import kubatech.loaders.item.items.ItemTeaIngredient; +import kubatech.loaders.item.items.ItemTeaUltimate; public class ItemLoader { @@ -87,45 +87,45 @@ public class ItemLoader { // DON'T EVER CHANGE ORDER IN HERE, ADD NEW ITEMS ON BOTTOM - LegendaryBlackTea.set(kubaitems.registerProxyItem(new TeaCollection("black_tea"))); - LegendaryButterflyTea.set(kubaitems.registerProxyItem(new TeaCollection("butterfly_tea"))); - LegendaryEarlGrayTea.set(kubaitems.registerProxyItem(new TeaCollection("earl_gray_tea"))); - LegendaryGreenTea.set(kubaitems.registerProxyItem(new TeaCollection("green_tea"))); - LegendaryLemonTea.set(kubaitems.registerProxyItem(new TeaCollection("lemon_tea"))); - LegendaryMilkTea.set(kubaitems.registerProxyItem(new TeaCollection("milk_tea"))); - LegendaryOolongTea.set(kubaitems.registerProxyItem(new TeaCollection("oolong_tea"))); - LegendaryPeppermintTea.set(kubaitems.registerProxyItem(new TeaCollection("peppermint_tea"))); - LegendaryPuerhTea.set(kubaitems.registerProxyItem(new TeaCollection("pu-erh_tea"))); - LegendaryRedTea.set(kubaitems.registerProxyItem(new TeaCollection("red_tea"))); - LegendaryWhiteTea.set(kubaitems.registerProxyItem(new TeaCollection("white_tea"))); - LegendaryYellowTea.set(kubaitems.registerProxyItem(new TeaCollection("yellow_tea"))); - LegendaryUltimateTea.set(kubaitems.registerProxyItem(new TeaUltimate())); - - BlackTea.set(kubaitems.registerProxyItem(new Tea("black_tea", 4, 0.3f))); - EarlGrayTea.set(kubaitems.registerProxyItem(new Tea("earl_gray_tea", 4, 0.3f))); - GreenTea.set(kubaitems.registerProxyItem(new Tea("green_tea", 4, 0.3f))); - LemonTea.set(kubaitems.registerProxyItem(new Tea("lemon_tea", 4, 0.3f))); - MilkTea.set(kubaitems.registerProxyItem(new Tea("milk_tea", 4, 0.3f))); - OolongTea.set(kubaitems.registerProxyItem(new Tea("oolong_tea", 4, 0.3f))); - PeppermintTea.set(kubaitems.registerProxyItem(new Tea("peppermint_tea", 4, 0.3f))); - PuerhTea.set(kubaitems.registerProxyItem(new Tea("pu-erh_tea", 4, 0.3f))); - WhiteTea.set(kubaitems.registerProxyItem(new Tea("white_tea", 4, 0.3f))); - YellowTea.set(kubaitems.registerProxyItem(new Tea("yellow_tea", 4, 0.3f))); - - BlackTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("black_tea_leaf"))); - GreenTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("green_tea_leaf"))); - OolongTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("oolong_tea_leaf"))); - PuerhTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("pu-erh_tea_leaf"))); - WhiteTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("white_tea_leaf"))); - YellowTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("yellow_tea_leaf"))); - - TeaLeafDehydrated.set(kubaitems.registerProxyItem(new TeaIngredient("tea_leaf_dehydrated"))); - SteamedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("steamed_tea_leaf"))); - RolledTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("rolled_tea_leaf"))); - OxidizedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("oxidized_tea_leaf"))); - FermentedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("fermented_tea_leaf"))); - BruisedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("bruised_tea_leaf"))); - PartiallyOxidizedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("partially_oxidized_tea_leaf"))); + LegendaryBlackTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("black_tea"))); + LegendaryButterflyTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("butterfly_tea"))); + LegendaryEarlGrayTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("earl_gray_tea"))); + LegendaryGreenTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("green_tea"))); + LegendaryLemonTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("lemon_tea"))); + LegendaryMilkTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("milk_tea"))); + LegendaryOolongTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("oolong_tea"))); + LegendaryPeppermintTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("peppermint_tea"))); + LegendaryPuerhTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("pu-erh_tea"))); + LegendaryRedTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("red_tea"))); + LegendaryWhiteTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("white_tea"))); + LegendaryYellowTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("yellow_tea"))); + LegendaryUltimateTea.set(kubaitems.registerProxyItem(new ItemTeaUltimate())); + + BlackTea.set(kubaitems.registerProxyItem(new ItemTea("black_tea", 4, 0.3f))); + EarlGrayTea.set(kubaitems.registerProxyItem(new ItemTea("earl_gray_tea", 4, 0.3f))); + GreenTea.set(kubaitems.registerProxyItem(new ItemTea("green_tea", 4, 0.3f))); + LemonTea.set(kubaitems.registerProxyItem(new ItemTea("lemon_tea", 4, 0.3f))); + MilkTea.set(kubaitems.registerProxyItem(new ItemTea("milk_tea", 4, 0.3f))); + OolongTea.set(kubaitems.registerProxyItem(new ItemTea("oolong_tea", 4, 0.3f))); + PeppermintTea.set(kubaitems.registerProxyItem(new ItemTea("peppermint_tea", 4, 0.3f))); + PuerhTea.set(kubaitems.registerProxyItem(new ItemTea("pu-erh_tea", 4, 0.3f))); + WhiteTea.set(kubaitems.registerProxyItem(new ItemTea("white_tea", 4, 0.3f))); + YellowTea.set(kubaitems.registerProxyItem(new ItemTea("yellow_tea", 4, 0.3f))); + + BlackTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("black_tea_leaf"))); + GreenTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("green_tea_leaf"))); + OolongTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("oolong_tea_leaf"))); + PuerhTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("pu-erh_tea_leaf"))); + WhiteTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("white_tea_leaf"))); + YellowTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("yellow_tea_leaf"))); + + TeaLeafDehydrated.set(kubaitems.registerProxyItem(new ItemTeaIngredient("tea_leaf_dehydrated"))); + SteamedTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("steamed_tea_leaf"))); + RolledTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("rolled_tea_leaf"))); + OxidizedTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("oxidized_tea_leaf"))); + FermentedTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("fermented_tea_leaf"))); + BruisedTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("bruised_tea_leaf"))); + PartiallyOxidizedTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("partially_oxidized_tea_leaf"))); TeaAcceptorResearchNote .set(kubaitems.registerProxyItem(new ItemProxy("tea_acceptor_research_note", "research_note"))); diff --git a/src/main/java/kubatech/loaders/MobHandlerLoader.java b/src/main/java/kubatech/loaders/MobHandlerLoader.java index c7932dd00c..d54edfa260 100644 --- a/src/main/java/kubatech/loaders/MobHandlerLoader.java +++ b/src/main/java/kubatech/loaders/MobHandlerLoader.java @@ -21,8 +21,8 @@ package kubatech.loaders; import static gregtech.api.enums.Mods.InfernalMobs; -import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher.DIAMOND_SPIKES_DAMAGE; -import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher.MOB_SPAWN_INTERVAL; +import static kubatech.tileentity.gregtech.multiblock.MTEExtremeEntityCrusher.DIAMOND_SPIKES_DAMAGE; +import static kubatech.tileentity.gregtech.multiblock.MTEExtremeEntityCrusher.MOB_SPAWN_INTERVAL; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; @@ -50,10 +50,10 @@ import com.kuba6000.mobsinfo.api.event.PreMobsRegistrationEvent; import atomicstryker.infernalmobs.common.InfernalMobsCore; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import kubatech.Tags; import kubatech.config.Config; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher; +import kubatech.tileentity.gregtech.multiblock.MTEExtremeEntityCrusher; public class MobHandlerLoader { @@ -90,7 +90,7 @@ public class MobHandlerLoader { mDuration = Math.max(MOB_SPAWN_INTERVAL, (int) ((recipe.maxEntityHealth / DIAMOND_SPIKES_DAMAGE) * 10d)); } - public ItemStack[] generateOutputs(Random rnd, GT_MetaTileEntity_ExtremeEntityCrusher MTE, double attackDamage, + public ItemStack[] generateOutputs(Random rnd, MTEExtremeEntityCrusher MTE, double attackDamage, int lootinglevel, boolean preferInfernalDrops, boolean voidAllDamagedAndEnchantedItems) { MTE.lEUt = mEUt; MTE.mMaxProgresstime = Math.max(MOB_SPAWN_INTERVAL, (int) ((recipe.maxEntityHealth / attackDamage) * 10d)); @@ -235,8 +235,8 @@ public class MobHandlerLoader { if (recipe != null) { event.additionalInformation.addAll( Arrays.asList( - GT_Utility.trans("153", "Usage: ") + GT_Utility.formatNumbers(recipe.mEUt) + " EU/t", - GT_Utility.trans("158", "Time: ") + GT_Utility.formatNumbers(recipe.mDuration / 20d) + " secs")); + GTUtility.trans("153", "Usage: ") + GTUtility.formatNumbers(recipe.mEUt) + " EU/t", + GTUtility.trans("158", "Time: ") + GTUtility.formatNumbers(recipe.mDuration / 20d) + " secs")); } } } diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index 94bb9fb8ee..139909851a 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -36,13 +36,13 @@ import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.AssemblyLine; -import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM; -import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.AssemblyLine; +import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM; +import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import static kubatech.api.enums.ItemList.BlackTea; import static kubatech.api.enums.ItemList.BlackTeaLeaf; @@ -82,29 +82,29 @@ import net.minecraftforge.fluids.FluidRegistry; import cpw.mods.fml.common.registry.GameRegistry; import forestry.plugins.PluginCore; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import ic2.core.Ic2Items; import kubatech.api.enums.ItemList; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_DEFusionCrafter; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_MegaIndustrialApiary; +import kubatech.tileentity.gregtech.multiblock.MTEDEFusionCrafter; +import kubatech.tileentity.gregtech.multiblock.MTEExtremeEntityCrusher; +import kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse; +import kubatech.tileentity.gregtech.multiblock.MTEMegaIndustrialApiary; public class RecipeLoader { - protected static final long bitsd = GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED - | GT_ModHandler.RecipeBits.DISMANTLEABLE; + protected static final long bitsd = GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED + | GTModHandler.RecipeBits.DISMANTLEABLE; public static void registerMTEs() { if (MobsInfo.isModLoaded() && EnderIO.isModLoaded()) { ExtremeEntityCrusher.set( - new GT_MetaTileEntity_ExtremeEntityCrusher( + new MTEExtremeEntityCrusher( ExtremeEntityCrusherController.ID, "multimachine.entitycrusher", "Extreme Entity Crusher").getStackForm(1)); @@ -112,21 +112,21 @@ public class RecipeLoader { if (Forestry.isModLoaded()) { ExtremeIndustrialApiary.set( - new GT_MetaTileEntity_MegaIndustrialApiary( + new MTEMegaIndustrialApiary( ExtremeIndustrialApiaryController.ID, "multimachine.extremeapiary", "Industrial Apicultural Acclimatiser and Drone Domestication Station").getStackForm(1)); } ExtremeIndustrialGreenhouse.set( - new GT_MetaTileEntity_ExtremeIndustrialGreenhouse( + new MTEExtremeIndustrialGreenhouse( ExtremeIndustrialGreenhouseController.ID, "multimachine.extremegreenhouse", "Extreme Industrial Greenhouse").getStackForm(1)); if (DraconicEvolution.isModLoaded()) { DraconicEvolutionFusionCrafter.set( - new GT_MetaTileEntity_DEFusionCrafter( + new MTEDEFusionCrafter( DraconicEvolutionFusionCrafterController.ID, "multimachine.defusioncrafter", "Draconic Evolution Fusion Crafter").getStackForm(1)); @@ -136,16 +136,16 @@ public class RecipeLoader { public static void addRecipes() { if (MobsInfo.isModLoaded() && EnderIO.isModLoaded()) { - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( ItemList.ExtremeEntityCrusher.get(1), bitsd, new Object[] { "RCR", "CHC", "VVV", 'R', gregtech.api.enums.ItemList.Robot_Arm_EV, 'C', OrePrefixes.circuit.get(Materials.EV), 'H', gregtech.api.enums.ItemList.Hull_EV, 'V', - GT_ModHandler.getModItem(OpenBlocks.ID, "vacuumhopper", 1, new ItemStack(Blocks.hopper)) }); + GTModHandler.getModItem(OpenBlocks.ID, "vacuumhopper", 1, new ItemStack(Blocks.hopper)) }); } if (Forestry.isModLoaded()) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, gregtech.api.enums.ItemList.Machine_IndustrialApiary.get(1)) .metadata(RESEARCH_TIME, 8 * MINUTES + 20 * SECONDS) .itemInputs( @@ -165,21 +165,20 @@ public class RecipeLoader { .duration(5 * MINUTES) .addTo(AssemblyLine); - GT_MetaTileEntity_ExtremeIndustrialGreenhouse - .addFertilizerItem(PluginCore.items.fertilizerCompound.getItemStack(1)); + MTEExtremeIndustrialGreenhouse.addFertilizerItem(PluginCore.items.fertilizerCompound.getItemStack(1)); } - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( ExtremeIndustrialGreenhouse.get(1), bitsd, new Object[] { "AZA", "BRB", "AZA", 'B', gregtech.api.enums.ItemList.Casing_CleanStainlessSteel, 'R', - GT_ModHandler.getModItem(EnderIO.ID, "blockFarmStation", 1, new ItemStack(Items.diamond_hoe)), 'A', + GTModHandler.getModItem(EnderIO.ID, "blockFarmStation", 1, new ItemStack(Items.diamond_hoe)), 'A', gregtech.api.enums.ItemList.AcceleratorIV.get(1), 'Z', OrePrefixes.circuit.get(Materials.ZPM) }); // Vanilla should always be loaded - GT_MetaTileEntity_ExtremeIndustrialGreenhouse.addFertilizerItem(new ItemStack(Items.dye, 1, 15)); + MTEExtremeIndustrialGreenhouse.addFertilizerItem(new ItemStack(Items.dye, 1, 15)); // IC2 should always be loaded - GT_MetaTileEntity_ExtremeIndustrialGreenhouse.addFertilizerItem(Ic2Items.fertilizer); + MTEExtremeIndustrialGreenhouse.addFertilizerItem(Ic2Items.fertilizer); if (DraconicEvolution.isModLoaded()) { // Controller recipe added in TecTech @@ -199,21 +198,21 @@ public class RecipeLoader { private static void RegisterTeaLine() { // TEA LINE // if (PamsHarvestCraft.isModLoaded()) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(GameRegistry.findItemStack("harvestcraft", "tealeafItem", 1)) .itemOutputs(TeaLeafDehydrated.get(1)) .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(TeaLeafDehydrated.get(1)) .itemOutputs(WhiteTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(TeaLeafDehydrated.get(1)) .itemOutputs(SteamedTeaLeaf.get(1)) .fluidInputs(FluidRegistry.getFluidStack("water", 50)) @@ -221,70 +220,70 @@ public class RecipeLoader { .duration(5 * SECONDS) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(SteamedTeaLeaf.get(1)) .itemOutputs(YellowTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(TeaLeafDehydrated.get(1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(TeaLeafDehydrated.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(RolledTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(RolledTeaLeaf.get(1)) .itemOutputs(GreenTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(RolledTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(RolledTeaLeaf.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(OxidizedTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(OxidizedTeaLeaf.get(1)) .itemOutputs(BlackTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(RolledTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(RolledTeaLeaf.get(1), GTUtility.getIntegratedCircuit(2)) .itemOutputs(FermentedTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(10 * SECONDS) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(FermentedTeaLeaf.get(1)) .itemOutputs(PuerhTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(TeaLeafDehydrated.get(1)) .itemOutputs(BruisedTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(BruisedTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(BruisedTeaLeaf.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(PartiallyOxidizedTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(2 * SECONDS + 10 * TICKS) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(PartiallyOxidizedTeaLeaf.get(1)) .itemOutputs(OolongTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) @@ -294,7 +293,7 @@ public class RecipeLoader { // Tea Assembly GameRegistry.addSmelting(BlackTeaLeaf.get(1), BlackTea.get(1), 10); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(BlackTea.get(1), GameRegistry.findItemStack("harvestcraft", "limejuiceItem", 1)) .itemOutputs(EarlGrayTea.get(1)) .eut(TierEU.RECIPE_LV) @@ -303,7 +302,7 @@ public class RecipeLoader { GameRegistry.addSmelting(GreenTeaLeaf.get(1), GreenTea.get(1), 10); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(BlackTea.get(1)) .itemOutputs(LemonTea.get(1)) .fluidInputs(FluidRegistry.getFluidStack("potion.lemonjuice", 1000)) @@ -311,7 +310,7 @@ public class RecipeLoader { .duration(5 * SECONDS) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(BlackTea.get(1)) .itemOutputs(MilkTea.get(1)) .fluidInputs(FluidRegistry.getFluidStack("milk", 1000)) @@ -321,7 +320,7 @@ public class RecipeLoader { GameRegistry.addSmelting(OolongTeaLeaf.get(1), OolongTea.get(1), 10); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(GameRegistry.findItemStack("harvestcraft", "peppermintItem", 1)) .itemOutputs(PeppermintTea.get(1)) .fluidInputs(FluidRegistry.getFluidStack("water", 1000)) @@ -334,7 +333,7 @@ public class RecipeLoader { GameRegistry.addSmelting(YellowTeaLeaf.get(1), YellowTea.get(1), 10); } if (Avaritia.isModLoaded() && NewHorizonsCoreMod.isModLoaded()) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, TeaAcceptorResearchNote.get(1)) .metadata(RESEARCH_TIME, 8 * MINUTES + 20 * SECONDS) .itemInputs( diff --git a/src/main/java/kubatech/loaders/TCLoader.java b/src/main/java/kubatech/loaders/TCLoader.java index f6ff1cac9f..500dab7f3e 100644 --- a/src/main/java/kubatech/loaders/TCLoader.java +++ b/src/main/java/kubatech/loaders/TCLoader.java @@ -36,7 +36,7 @@ import com.kuba6000.mobsinfo.api.utils.ItemID; import cpw.mods.fml.common.registry.GameRegistry; import kubatech.api.enums.ItemList; -import kubatech.loaders.item.items.TeaUltimate; +import kubatech.loaders.item.items.ItemTeaUltimate; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; @@ -135,14 +135,14 @@ public class TCLoader { @Override public String getName() { - return TeaUltimate.getUltimateTeaDisplayName(super.getName()); + return ItemTeaUltimate.getUltimateTeaDisplayName(super.getName()); } }; ultimateTeaResearch.setPages(new ResearchPage("KT.research.ultimatetea") { @Override public String getTranslatedText() { - return TeaUltimate.getUltimateTeaDisplayName(super.getTranslatedText()); + return ItemTeaUltimate.getUltimateTeaDisplayName(super.getTranslatedText()); } }, new ResearchPage(ultimateTeaRecipe)); ultimateTeaResearch.setParents("INFUSION", "DEZILSMARSHMALLOW"); diff --git a/src/main/java/kubatech/loaders/block/defc/BlockDEFCCasing.java b/src/main/java/kubatech/loaders/block/defc/BlockDEFCCasing.java new file mode 100644 index 0000000000..6c57cf8821 --- /dev/null +++ b/src/main/java/kubatech/loaders/block/defc/BlockDEFCCasing.java @@ -0,0 +1,63 @@ +package kubatech.loaders.block.defc; + +import static kubatech.kubatech.KT; + +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.Textures; +import gregtech.api.render.TextureFactory; +import gregtech.api.util.GTLanguageManager; +import gregtech.common.blocks.BlockCasingsAbstract; +import kubatech.Tags; +import kubatech.api.enums.ItemList; + +public class BlockDEFCCasing extends BlockCasingsAbstract { + + @SideOnly(Side.CLIENT) + private IIcon[] texture; + + public BlockDEFCCasing() { + super(ItemBlockDEFCCasing.class, "defc.casing", Material.anvil); + this.setHardness(15.0F); + this.setResistance(30.0F); + this.setCreativeTab(KT); + + GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Naquadah Alloy Fusion Casing"); + GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Bloody Ichorium Fusion Casing"); + GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Draconium Fusion Casing"); + GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Wyvern Fusion Casing"); + GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Awakened Draconium Fusion Casing"); + GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Chaotic Fusion Casing"); + + ItemList.DEFCCasingBase.set(new ItemStack(this, 1, 7)); + ItemList.DEFCCasingT1.set(new ItemStack(this, 1, 8)); + ItemList.DEFCCasingT2.set(new ItemStack(this, 1, 9)); + ItemList.DEFCCasingT3.set(new ItemStack(this, 1, 10)); + ItemList.DEFCCasingT4.set(new ItemStack(this, 1, 11)); + ItemList.DEFCCasingT5.set(new ItemStack(this, 1, 12)); + + // Taking one texture slot :P + Textures.BlockIcons.setCasingTexture((byte) 1, (byte) (15 + 48), TextureFactory.of(this, 0)); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + if (meta < 7 || meta > 12) return texture[0]; + return texture[meta - 7]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister aIconRegister) { + texture = new IIcon[6]; + for (int i = 0; i < texture.length; i++) { + texture[i] = aIconRegister.registerIcon(Tags.MODID + ":casing/defc_" + i); + } + } +} diff --git a/src/main/java/kubatech/loaders/block/defc/DEFCCasingBlock.java b/src/main/java/kubatech/loaders/block/defc/DEFCCasingBlock.java deleted file mode 100644 index 5a6b95acfe..0000000000 --- a/src/main/java/kubatech/loaders/block/defc/DEFCCasingBlock.java +++ /dev/null @@ -1,63 +0,0 @@ -package kubatech.loaders.block.defc; - -import static kubatech.kubatech.KT; - -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.Textures; -import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_LanguageManager; -import gregtech.common.blocks.GT_Block_Casings_Abstract; -import kubatech.Tags; -import kubatech.api.enums.ItemList; - -public class DEFCCasingBlock extends GT_Block_Casings_Abstract { - - @SideOnly(Side.CLIENT) - private IIcon[] texture; - - public DEFCCasingBlock() { - super(DEFCCasingItemBlock.class, "defc.casing", Material.anvil); - this.setHardness(15.0F); - this.setResistance(30.0F); - this.setCreativeTab(KT); - - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Naquadah Alloy Fusion Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Bloody Ichorium Fusion Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Draconium Fusion Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Wyvern Fusion Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Awakened Draconium Fusion Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Chaotic Fusion Casing"); - - ItemList.DEFCCasingBase.set(new ItemStack(this, 1, 7)); - ItemList.DEFCCasingT1.set(new ItemStack(this, 1, 8)); - ItemList.DEFCCasingT2.set(new ItemStack(this, 1, 9)); - ItemList.DEFCCasingT3.set(new ItemStack(this, 1, 10)); - ItemList.DEFCCasingT4.set(new ItemStack(this, 1, 11)); - ItemList.DEFCCasingT5.set(new ItemStack(this, 1, 12)); - - // Taking one texture slot :P - Textures.BlockIcons.setCasingTexture((byte) 1, (byte) (15 + 48), TextureFactory.of(this, 0)); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - if (meta < 7 || meta > 12) return texture[0]; - return texture[meta - 7]; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister aIconRegister) { - texture = new IIcon[6]; - for (int i = 0; i < texture.length; i++) { - texture[i] = aIconRegister.registerIcon(Tags.MODID + ":casing/defc_" + i); - } - } -} diff --git a/src/main/java/kubatech/loaders/block/defc/DEFCCasingItemBlock.java b/src/main/java/kubatech/loaders/block/defc/DEFCCasingItemBlock.java deleted file mode 100644 index 669e3a6dc8..0000000000 --- a/src/main/java/kubatech/loaders/block/defc/DEFCCasingItemBlock.java +++ /dev/null @@ -1,36 +0,0 @@ -package kubatech.loaders.block.defc; - -import static kubatech.kubatech.KT; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; - -import gregtech.common.blocks.GT_Item_Casings_Abstract; - -public class DEFCCasingItemBlock extends GT_Item_Casings_Abstract { - - public DEFCCasingItemBlock(Block block) { - super(block); - this.setMaxDamage(0); - this.setHasSubtypes(true); - this.setCreativeTab(KT); - } - - @Override - @SuppressWarnings("unchecked") - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { - if (getDamage(aStack) > 7) - aList.add(StatCollector.translateToLocalFormatted("defc.casing.tip", getDamage(aStack) - 7)); - super.addInformation(aStack, aPlayer, aList, aF3_H); - } - - @Override - public IIcon getIconFromDamage(int p_77617_1_) { - return this.field_150939_a.getIcon(0, p_77617_1_); - } -} diff --git a/src/main/java/kubatech/loaders/block/defc/ItemBlockDEFCCasing.java b/src/main/java/kubatech/loaders/block/defc/ItemBlockDEFCCasing.java new file mode 100644 index 0000000000..125bb7091f --- /dev/null +++ b/src/main/java/kubatech/loaders/block/defc/ItemBlockDEFCCasing.java @@ -0,0 +1,36 @@ +package kubatech.loaders.block.defc; + +import static kubatech.kubatech.KT; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; + +import gregtech.common.blocks.ItemCasingsAbstract; + +public class ItemBlockDEFCCasing extends ItemCasingsAbstract { + + public ItemBlockDEFCCasing(Block block) { + super(block); + this.setMaxDamage(0); + this.setHasSubtypes(true); + this.setCreativeTab(KT); + } + + @Override + @SuppressWarnings("unchecked") + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + if (getDamage(aStack) > 7) + aList.add(StatCollector.translateToLocalFormatted("defc.casing.tip", getDamage(aStack) - 7)); + super.addInformation(aStack, aPlayer, aList, aF3_H); + } + + @Override + public IIcon getIconFromDamage(int p_77617_1_) { + return this.field_150939_a.getIcon(0, p_77617_1_); + } +} diff --git a/src/main/java/kubatech/loaders/block/kubablock/blocks/BlockTeaAcceptor.java b/src/main/java/kubatech/loaders/block/kubablock/blocks/BlockTeaAcceptor.java new file mode 100644 index 0000000000..2787a2bbb1 --- /dev/null +++ b/src/main/java/kubatech/loaders/block/kubablock/blocks/BlockTeaAcceptor.java @@ -0,0 +1,64 @@ +/* + * spotless:off + * KubaTech - Gregtech Addon + * Copyright (C) 2022 - 2024 kuba6000 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + * spotless:on + */ + +package kubatech.loaders.block.kubablock.blocks; + +import java.util.List; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import kubatech.loaders.block.kubablock.BlockProxy; +import kubatech.loaders.block.kubablock.IProxyTileEntityProvider; +import kubatech.tileentity.TeaAcceptorTile; + +public class BlockTeaAcceptor extends BlockProxy implements IProxyTileEntityProvider { + + public BlockTeaAcceptor() { + super("tea_acceptor", "tea_acceptor", "blank"); + } + + @Override + public TileEntity createTileEntity(World world) { + return new TeaAcceptorTile(); + } + + @Override + public void onBlockPlaced(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + if (world.isRemote) return; + if (!(player instanceof EntityPlayerMP)) return; + ((TeaAcceptorTile) world.getTileEntity(x, y, z)).setTeaOwner(player.getPersistentID()); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer entity, List tooltipList, boolean showDebugInfo) { + tooltipList.add("Accepts Tea items and adds them to your network"); + tooltipList.add("Can accept up to 10 stacks per tick"); + } + + @Override + public float getResistance() { + return 999999999999.f; + } +} diff --git a/src/main/java/kubatech/loaders/block/kubablock/blocks/BlockTeaStorage.java b/src/main/java/kubatech/loaders/block/kubablock/blocks/BlockTeaStorage.java new file mode 100644 index 0000000000..421ceaa0d2 --- /dev/null +++ b/src/main/java/kubatech/loaders/block/kubablock/blocks/BlockTeaStorage.java @@ -0,0 +1,66 @@ +/* + * spotless:off + * KubaTech - Gregtech Addon + * Copyright (C) 2022 - 2024 kuba6000 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABI