diff options
Diffstat (limited to 'src/main/java/gregtech')
7 files changed, 12 insertions, 221 deletions
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index bd30f03c3e..6f7c347884 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -31,6 +31,10 @@ import it.unimi.dsi.fastutil.objects.ObjectSet; public enum OrePrefixes { + // used for removed prefixes to prevent id shifts + ___placeholder___("Placeholder", "", "", false, false, false, false, false, false, false, false, false, false, 0, 0, + 1, -1), + @Deprecated pulp("Pulps", "", "", false, false, false, false, false, false, false, false, false, false, B[0] | B[1] | B[2] | B[3], -1, 64, -1), @@ -230,18 +234,6 @@ public enum OrePrefixes { /** 3/4 of a Plate or Gem used to shape a Lense. Normally only used on Transparent Materials. */ lens("Lenses", "", " Lens", true, true, false, false, false, false, true, true, false, false, B[2], (M * 3) / 4, 64, 24), - /** consisting out of 16 Dusts. */ - crateGtDust("Crates of Dust", "Crate of ", " Dust", true, true, false, true, false, false, false, true, false, - false, B[0] | B[1] | B[2] | B[3], -1, 64, 96), - /** consisting out of 16 Plates. */ - crateGtPlate("Crates of Plates", "Crate of ", " Plate", true, true, false, true, false, false, false, true, false, - false, B[1] | B[2], -1, 64, 99), - /** consisting out of 16 Ingots. */ - crateGtIngot("Crates of Ingots", "Crate of ", " Ingot", true, true, false, true, false, false, false, true, false, - false, B[1], -1, 64, 97), - /** consisting out of 16 Gems. */ - crateGtGem("Crates of Gems", "Crate of ", " Gem", true, true, false, true, false, false, false, true, false, false, - B[2], -1, 64, 98), /** Hot Cell full of Plasma, which can be used in the Plasma Generator. */ cellPlasma("Cells of Plasma", "", " Plasma Cell", true, true, true, true, false, false, false, true, false, false, B[5], M * 1, 64, 31), @@ -858,10 +850,6 @@ public enum OrePrefixes { dust.mGeneratedItems.addAll(dustRefined.mGeneratedItems); dustTiny.mGeneratedItems.addAll(dust.mGeneratedItems); dustSmall.mGeneratedItems.addAll(dust.mGeneratedItems); - crateGtDust.mGeneratedItems.addAll(dust.mGeneratedItems); - crateGtIngot.mGeneratedItems.addAll(ingot.mGeneratedItems); - crateGtGem.mGeneratedItems.addAll(gem.mGeneratedItems); - crateGtPlate.mGeneratedItems.addAll(plate.mGeneratedItems); // ----- toolHeadFile.mCondition = new ICondition.And<>( @@ -1074,10 +1062,6 @@ public enum OrePrefixes { OrePrefixes.gemFlawless, OrePrefixes.gemExquisite, OrePrefixes.gearGt, - OrePrefixes.crateGtDust, - OrePrefixes.crateGtIngot, - OrePrefixes.crateGtGem, - OrePrefixes.crateGtPlate, OrePrefixes.itemCasing, OrePrefixes.nanite)); /** @@ -1133,8 +1117,6 @@ public enum OrePrefixes { new TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2).addToAspectList(mAspects); } else if (name().startsWith("gem") || name().startsWith("crystal") || name().startsWith("lens")) { new TC_AspectStack(TC_Aspects.VITREUS, 1).addToAspectList(mAspects); - } else if (name().startsWith("crate")) { - new TC_AspectStack(TC_Aspects.ITER, 2).addToAspectList(mAspects); } else if (name().startsWith("circuit")) { new TC_AspectStack(TC_Aspects.COGNITIO, 1).addToAspectList(mAspects); } else if (name().startsWith("computer")) { @@ -1299,20 +1281,6 @@ public enum OrePrefixes { @SuppressWarnings("incomplete-switch") public String getDefaultLocalNameFormatForItem(Materials aMaterial) { // Certain Materials have slightly different Localizations. - switch (this) { - case crateGtDust -> { - return mLocalizedMaterialPre + OrePrefixes.dust.getDefaultLocalNameFormatForItem(aMaterial); - } - case crateGtIngot -> { - return mLocalizedMaterialPre + OrePrefixes.ingot.getDefaultLocalNameFormatForItem(aMaterial); - } - case crateGtGem -> { - return mLocalizedMaterialPre + OrePrefixes.gem.getDefaultLocalNameFormatForItem(aMaterial); - } - case crateGtPlate -> { - return mLocalizedMaterialPre + OrePrefixes.plate.getDefaultLocalNameFormatForItem(aMaterial); - } - } switch (aMaterial.mName) { case "Glass", "BorosilicateGlass" -> { if (name().startsWith("gem")) return mLocalizedMaterialPre + "%material" + " Crystal"; diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java index a06a4a7a63..c344397e4e 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java @@ -54,6 +54,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item { for (int i = 0; i < 32000; i++) { OrePrefixes tPrefix = mGeneratedPrefixList[i / 1000]; if (tPrefix == null) continue; + if (tPrefix == OrePrefixes.___placeholder___) continue; Materials tMaterial = GregTech_API.sGeneratedMaterials[i % 1000]; if (tMaterial == null) continue; if (doesMaterialAllowGeneration(tPrefix, tMaterial)) { diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index 35d1603587..814f542226 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -259,10 +259,10 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { public GT_MetaGenerated_Item_03() { super( "metaitem.03", - OrePrefixes.crateGtDust, - OrePrefixes.crateGtIngot, - OrePrefixes.crateGtGem, - OrePrefixes.crateGtPlate, + OrePrefixes.___placeholder___, + OrePrefixes.___placeholder___, + OrePrefixes.___placeholder___, + OrePrefixes.___placeholder___, OrePrefixes.nanite, OrePrefixes.rawOre); INSTANCE = this; diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java deleted file mode 100644 index 105b5c8f13..0000000000 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java +++ /dev/null @@ -1,132 +0,0 @@ -package gregtech.loaders.oreprocessing; - -import static gregtech.api.recipe.RecipeMaps.packagerRecipes; -import static gregtech.api.recipe.RecipeMaps.unpackagerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; - -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.common.GT_Proxy; - -public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegistrator { - - public ProcessingCrate() { - OrePrefixes.crateGtDust.add(this); - OrePrefixes.crateGtIngot.add(this); - OrePrefixes.crateGtGem.add(this); - OrePrefixes.crateGtPlate.add(this); - } - - @Override - public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { - boolean aSpecialRecipeReq2 = aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) - && !aMaterial.contains(SubTag.NO_WORKING); - switch (aPrefix) { - case crateGtDust -> { - if (GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), - ItemList.Crate_Empty.get(1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtDust, aMaterial, 1L)) - .duration(5 * SECONDS) - .eut(8) - .addTo(packagerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crateGtDust, aMaterial, 1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), - ItemList.Crate_Empty.get(1L)) - .duration(40 * SECONDS) - .eut(1) - .addTo(unpackagerRecipes); - } - if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), - GT_Proxy.tBits, - new Object[] { "Xc", 'X', OrePrefixes.crateGtDust.get(aMaterial) }); - } - case crateGtIngot -> { - if (GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L), - ItemList.Crate_Empty.get(1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, aMaterial, 1L)) - .duration(5 * SECONDS) - .eut(8) - .addTo(packagerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, aMaterial, 1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L), - ItemList.Crate_Empty.get(1L)) - .duration(40 * SECONDS) - .eut(1) - .addTo(unpackagerRecipes); - } - if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L), - GT_Proxy.tBits, - new Object[] { "Xc", 'X', OrePrefixes.crateGtIngot.get(aMaterial) }); - } - case crateGtGem -> { - if (GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L), - ItemList.Crate_Empty.get(1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtGem, aMaterial, 1L)) - .duration(5 * SECONDS) - .eut(8) - .addTo(packagerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crateGtGem, aMaterial, 1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L), - ItemList.Crate_Empty.get(1L)) - .duration(40 * SECONDS) - .eut(1) - .addTo(unpackagerRecipes); - } - if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L), - GT_Proxy.tBits, - new Object[] { "Xc", 'X', OrePrefixes.crateGtGem.get(aMaterial) }); - } - case crateGtPlate -> { - if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L), - ItemList.Crate_Empty.get(1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtPlate, aMaterial, 1L)) - .duration(5 * SECONDS) - .eut(8) - .addTo(packagerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crateGtPlate, aMaterial, 1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L), - ItemList.Crate_Empty.get(1L)) - .duration(40 * SECONDS) - .eut(1) - .addTo(unpackagerRecipes); - } - if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L), - GT_Proxy.tBits, - new Object[] { "Xc", 'X', OrePrefixes.crateGtPlate.get(aMaterial) }); - } - default -> {} - } - } -} diff --git a/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java b/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java index 71c8d67741..00d7010790 100644 --- a/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java @@ -359,49 +359,6 @@ public class GT_BookAndLootLoader implements Runnable { .addItem("strongholdCrossing", new WeightedRandomChestContent(ItemList.McGuffium_239.get(1L), 1, 1, 10)); ChestGenHooks.addItem( - "strongholdCrossing", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.DamascusSteel, 1L), - 4, - 8, - 6)); - ChestGenHooks.addItem( - "strongholdCrossing", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.Steel, 1L), - 8, - 16, - 12)); - ChestGenHooks.addItem( - "strongholdCrossing", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.Bronze, 1L), - 8, - 16, - 12)); - ChestGenHooks.addItem( - "strongholdCrossing", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.Manganese, 1L), - 4, - 8, - 12)); - ChestGenHooks.addItem( - "strongholdCrossing", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.crateGtDust, Materials.Neodymium, 1L), - 4, - 8, - 6)); - ChestGenHooks.addItem( - "strongholdCrossing", - new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.crateGtDust, Materials.Chrome, 1L), - 2, - 4, - 6)); - - ChestGenHooks.addItem( "strongholdCorridor", new WeightedRandomChestContent( GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.DamascusSteel, 1L), diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java index 116b6928e4..541fcbc2e5 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java @@ -10,7 +10,6 @@ import gregtech.loaders.oreprocessing.ProcessingCell; import gregtech.loaders.oreprocessing.ProcessingCircuit; import gregtech.loaders.oreprocessing.ProcessingCompressed; import gregtech.loaders.oreprocessing.ProcessingCrafting; -import gregtech.loaders.oreprocessing.ProcessingCrate; import gregtech.loaders.oreprocessing.ProcessingCrop; import gregtech.loaders.oreprocessing.ProcessingCrushedOre; import gregtech.loaders.oreprocessing.ProcessingCrystallized; @@ -65,7 +64,6 @@ public class GT_Loader_OreProcessing implements Runnable { new ProcessingBlock(); new ProcessingBolt(); new ProcessingCell(); - new ProcessingCrate(); new ProcessingCircuit(); new ProcessingCompressed(); new ProcessingCrafting(); diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java index bbbb9af59d..d7c752a199 100644 --- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java +++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java @@ -289,8 +289,7 @@ public class GT_PreLoad { "toolHeadBuzzSaw", "turbineBlade", null, null, "wireFine", "gearGtSmall", "rotor", "stickLong", "springSmall", "spring", "arrowGtWood", "arrowGtPlastic", "gemChipped", "gemFlawed", "gemFlawless", "gemExquisite", "gearGt" }; - if (mIt == 3) tags = new String[] { "crateGtDust", "crateGtIngot", "crateGtGem", - "crateGtPlate", "itemCasing", "nanite" }; + if (mIt == 3) tags = new String[] { "itemCasing", "nanite" }; if (tags.length > prefix) tag = tags[prefix]; if (GregTech_API.sGeneratedMaterials[material] != null) { tag += GregTech_API.sGeneratedMaterials[material].mName; @@ -313,8 +312,8 @@ public class GT_PreLoad { "toolHeadHammer", "toolHeadFile", "toolHeadSaw", "toolHeadDrill", "toolHeadChainsaw", "toolHeadWrench", "toolHeadUniversalSpade", "toolHeadSense", "toolHeadPlow", "toolHeadArrow", "toolHeadBuzzSaw", "turbineBlade", "wireFine", "gearGtSmall", "rotor", "stickLong", "springSmall", "spring", "arrowGtWood", - "arrowGtPlastic", "gemChipped", "gemFlawed", "gemFlawless", "gemExquisite", "gearGt", "crateGtDust", - "crateGtIngot", "crateGtGem", "crateGtPlate", "nanite", "cellMolten", "rawOre" }; + "arrowGtPlastic", "gemChipped", "gemFlawed", "gemFlawless", "gemExquisite", "gearGt", "nanite", + "cellMolten", "rawOre" }; List<String> mMTTags = new ArrayList<>(); oreTags.stream() |