Skip to content

Commit

Permalink
Removed a bunch of unnecessary mod compat stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnch18
johnch18 committed Sep 15, 2024
1 parent 94cfad2 commit 8db780d
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 23 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ dependencies {
compileOnly(deobfCurse("applecore-224472:2530879"))

//TiCon 1.8.8
compileOnly(deobfCurse("tconstruct-74072:2264246"))
// compileOnly(deobfCurse("tconstruct-74072:2264246"))

compileOnly("com.enderio:EnderIO:1.7.10-2.3.0.417_beta:dev") {
excludeDeps()
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/gregtech/GT_Mod.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1019,6 +1019,7 @@ public void onPostLoad(FMLPostInitializationEvent aEvent) {
GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Orb to overwrite")}, new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Copy of the Orb")}, ItemList.Tool_DataOrb.getWithName(0L, "Orb to copy"), null, null, 512, 30, 0);
GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Stick to overwrite")}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Copy of the Stick")}, ItemList.Tool_DataStick.getWithName(0L, "Stick to copy"), null, null, 128, 30, 0);
GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Raw Prospection Data")}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Analyzed Prospection Data")}, null, null, null, 1000, 30, 0);
/*
if (Loader.isModLoaded("GalacticraftCore")) {
GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{GT_ModHandler.getModItem("GalacticraftCore", "item.schematic", 1, Short.MAX_VALUE).setStackDisplayName("Any Schematic")}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic")}, ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), null, null, 36000, 480, 0);
if (Loader.isModLoaded("GalacticraftMars"))
Expand All @@ -1029,6 +1030,7 @@ public void onPostLoad(FMLPostInitializationEvent aEvent) {
}
}
}
*/
Materials.getMaterialsMap().values().stream().forEach(tMaterial -> {
if ((tMaterial.mElement != null) && (!tMaterial.mElement.mIsIsotope) && (tMaterial != Materials.Magic) && (tMaterial.getMass() > 0L)) {
ItemStack tOutput = ItemList.Tool_DataOrb.get(1L);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/gregtech/common/GT_Proxy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ public void onPreLoad() {
GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "frameImpregnated", 1L, 32767));
GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "frameProven", 1L, 32767));
GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "waxCast", 1L, 32767));
GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem("GalacticraftCore", "item.sensorGlasses", 1L, 32767));
// GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem("GalacticraftCore", "item.sensorGlasses", 1L, 32767));
GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem("IC2NuclearControl", "ItemToolThermometer", 1L, 32767));

RecipeSorter.register("gregtech:shaped", GT_Shaped_Recipe.class, RecipeSorter.Category.SHAPED, "after:minecraft:shaped before:minecraft:shapeless");
Expand All @@ -555,10 +555,10 @@ public void onLoad() {
GT_OreDictUnificator.registerOre("cropChilipepper", GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 2));
GT_OreDictUnificator.registerOre("cropTomato", GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 8));
GT_OreDictUnificator.registerOre("cropGrape", GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 4));
GT_OreDictUnificator.registerOre("cropTea", GT_ModHandler.getModItem("ganyssurface", "teaLeaves", 1L, 0));
// GT_OreDictUnificator.registerOre("cropTea", GT_ModHandler.getModItem("ganyssurface", "teaLeaves", 1L, 0));

// Clay buckets, which don't get registered until Iguana Tweaks pre-init
if (Loader.isModLoaded("IguanaTweaksTConstruct")) {
/*if (Loader.isModLoaded("IguanaTweaksTConstruct")) {
OrePrefixes.bucketClay.mContainerItem = GT_ModHandler.getModItem("IguanaTweaksTConstruct", "clayBucketFired", 1L, 0);
GT_OreDictUnificator.set(OrePrefixes.bucketClay, Materials.Empty, GT_ModHandler.getModItem("IguanaTweaksTConstruct", "clayBucketFired", 1L, 0));
GT_OreDictUnificator.set(OrePrefixes.bucketClay, Materials.Water, GT_ModHandler.getModItem("IguanaTweaksTConstruct", "clayBucketWater", 1L, 0));
Expand All @@ -570,7 +570,7 @@ public void onLoad() {
Materials.Milk.getFluid(1000L),
GT_OreDictUnificator.get(OrePrefixes.bucketClay, Materials.Milk, 1L),
GT_OreDictUnificator.get(OrePrefixes.bucketClay, Materials.Empty, 1L)));
}
}*/

// IC2 Hazmat
addFullHazmatToIC2Item("hazmatHelmet");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,13 +367,13 @@ public GT_MetaGenerated_Item_01() {

GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Platinum, 2L), new ItemStack(Items.flint, 1), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.Tool_Lighter_Platinum_Empty.get(1L), 256, 256);

if (Loader.isModLoaded("GalacticraftMars")) {
/*if (Loader.isModLoaded("GalacticraftMars")) {
ItemList.Ingot_Heavy1.set(addItem(tLastID = 462, "Heavy Duty Alloy Ingot T1", "Used to make Heavy Duty Plates T1"));
ItemList.Ingot_Heavy2.set(addItem(tLastID = 463, "Heavy Duty Alloy Ingot T2", "Used to make Heavy Duty Plates T2"));
ItemList.Ingot_Heavy3.set(addItem(tLastID = 464, "Heavy Duty Alloy Ingot T3", "Used to make Heavy Duty Plates T3"));
//GT_ModHandler.addCraftingRecipe(ItemList.Ingot_Heavy1.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"BhB", "CAS", "B B", 'B', OrePrefixes.bolt.get(Materials.StainlessSteel), 'C', OrePrefixes.compressed.get(Materials.Bronze), 'A', OrePrefixes.compressed.get(Materials.Aluminium), 'S', OrePrefixes.compressed.get(Materials.Steel)});
}
}*/
ItemList.Ingot_IridiumAlloy.set(addItem(tLastID = 480, "Iridium Alloy Ingot", "Used to make Iridium Plates", new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)));

//GT_ModHandler.addRollingMachineRecipe(ItemList.Ingot_IridiumAlloy.get(1L, new Object[0]), new Object[]{"IAI", "ADA", "IAI", 'D', GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "iridiumplate", true) ? OreDictNames.craftingIndustrialDiamond : OrePrefixes.dust.get(Materials.Diamond), 'A', OrePrefixes.plateAlloy.get("Advanced"), 'I', OrePrefixes.plate.get(Materials.Iridium)});
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public int checkRecipe() {
return 2;
}

if ((aStack.getItem().getUnlocalizedName().contains("Schematic") || aStack.getItem().getUnlocalizedName().contains("schematic")) && !aStack.getItem().getUnlocalizedName().contains("Schematics")) {
/*if ((aStack.getItem().getUnlocalizedName().contains("Schematic") || aStack.getItem().getUnlocalizedName().contains("schematic")) && !aStack.getItem().getUnlocalizedName().contains("Schematics")) {
if (mTier < 3)
return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
String sTier = "";
Expand Down Expand Up @@ -222,7 +222,7 @@ else if (aStack.getItemDamage() == 2 && aStack.toString().equals(GT_ModHandler.g
if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1)
return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
return 2;
}
}*/

}
if (getSpecialSlot() == null && ItemList.Tool_DataStick.isStackEqual(aStack, false, true)) {
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STICKY), 0.05f);
beeSpecies.setHumidity(DAMP);
beeSpecies.setTemperature(EnumTemperature.NORMAL);
if (Loader.isModLoaded("TConstruct")) {
/*if (Loader.isModLoaded("TConstruct")) {
beeSpecies.addProduct(GT_ModHandler.getModItem("TConstruct", "strangeFood", 1, 0), 0.10f);
beeSpecies.addSpecialty(GT_ModHandler.getModItem("TConstruct", "slime.gel", 1, 2), 0.01f);
}
}*/
},
template -> {
AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.MUSHROOMS);
Expand All @@ -100,8 +100,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
},
dis -> {
IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Marshy"), CLAY, 7);
if (Loader.isModLoaded("TConstruct"))
tMutation.requireResource(GameRegistry.findBlock("TConstruct", "slime.gel"), 1);
/*if (Loader.isModLoaded("TConstruct"))
tMutation.requireResource(GameRegistry.findBlock("TConstruct", "slime.gel"), 1);*/
}
),
PEAT(GT_BranchDefinition.ORGANIC, "Peat", true, new Color(0x906237), new Color(0x58300B),
Expand Down Expand Up @@ -2537,8 +2537,8 @@ public void accept(GT_BeeDefinition dis) {
template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST),
dis -> {
IBeeMutationCustom tMutation = dis.registerMutation(NEUTRONIUM, DOB, 7, 10);
if (Loader.isModLoaded("Avaritia"))
tMutation.requireResource(GameRegistry.findBlock("Avaritia", "Resource_Block"), 0);
/*if (Loader.isModLoaded("Avaritia"))
tMutation.requireResource(GameRegistry.findBlock("Avaritia", "Resource_Block"), 0);*/
}
),
INFINITYCATALYST(GT_BranchDefinition.PLANET, "InfinityCatalyst", false, new Color(0xFFFFFF), new Color(0xFFFFFF),
Expand All @@ -2555,8 +2555,8 @@ public void accept(GT_BeeDefinition dis) {
},
dis -> {
IMutationCustom tMutation = dis.registerMutation(DOB, COSMICNEUTRONIUM, 3, 10).setIsSecret();
if (Loader.isModLoaded("Avaritia"))
tMutation.requireResource(GameRegistry.findBlock("Avaritia", "Resource_Block"), 1);
/*if (Loader.isModLoaded("Avaritia"))
tMutation.requireResource(GameRegistry.findBlock("Avaritia", "Resource_Block"), 1);*/
}
),
INFINITY(GT_BranchDefinition.PLANET, "Infinity", false, new Color(0xFFFFFF), new Color(0xFFFFFF),
Expand All @@ -2570,8 +2570,8 @@ public void accept(GT_BeeDefinition dis) {
template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST),
dis -> {
IBeeMutationCustom tMutation = dis.registerMutation(INFINITYCATALYST, COSMICNEUTRONIUM, 1, 100);
if (Loader.isModLoaded("avaritiaddons"))
tMutation.requireResource(GameRegistry.findBlock("avaritiaddons", "InfinityChest"), 0);
/*if (Loader.isModLoaded("avaritiaddons"))
tMutation.requireResource(GameRegistry.findBlock("avaritiaddons", "InfinityChest"), 0);*/
}
),
;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,7 @@ public void run() {
GT_ModHandler.addExtractionRecipe(GT_ModHandler.getIC2Item("rubberSapling", 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1L));
GT_ModHandler.addExtractionRecipe(GT_ModHandler.getIC2Item("rubberLeaves", 16L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1L));
GT_ModHandler.addExtractionRecipe(ItemList.Cell_Air.get(1L), ItemList.Cell_Empty.get(1L));
if (Loader.isModLoaded(GT_MachineRecipeLoader.aTextEBXL)) {
/*if (Loader.isModLoaded(GT_MachineRecipeLoader.aTextEBXL)) {
GT_ModHandler.addExtractionRecipe(GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "waterplant1", 1, 0), new ItemStack(Items.dye, 4, 2));
GT_ModHandler.addExtractionRecipe(GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "vines", 1, 0), new ItemStack(Items.dye, 4, 1));
GT_ModHandler.addExtractionRecipe(GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 11), new ItemStack(Items.dye, 4, 11));
Expand Down Expand Up @@ -1039,7 +1039,7 @@ public void run() {
GT_ModHandler.addCompressionRecipe(GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 3), ItemList.IC2_Plantball.get(1));
GT_ModHandler.addCompressionRecipe(GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 4), ItemList.IC2_Plantball.get(1));

}
}*/
//GT_ModHandler.addCompressionRecipe(GT_ModHandler.getModItem("miscutils", "blockRainforestOakSapling", 8, 0), ItemList.IC2_Plantball.get(1));

GT_ModHandler.addCompressionRecipe(ItemList.IC2_Compressed_Coal_Chunk.get(1L), ItemList.IC2_Industrial_Diamond.get(1L));
Expand Down Expand Up @@ -1326,7 +1326,7 @@ public void run() {
GT_Values.RA.addCutterRecipe(new ItemStack(Blocks.stained_glass, 3, i), new ItemStack(Blocks.stained_glass_pane, 8, i), GT_Values.NI, 50, 8);
}
GT_Values.RA.addCutterRecipe(new ItemStack(Blocks.glass, 3, 0), new ItemStack(Blocks.glass_pane, 8, 0), GT_Values.NI, 50, 8);
GT_Values.RA.addCutterRecipe(GT_ModHandler.getModItem("TConstruct", "GlassBlock", 3L, 0), GT_ModHandler.getModItem("TConstruct", "GlassPane", 8L, 0), GT_Values.NI, 50, 8);
// GT_Values.RA.addCutterRecipe(GT_ModHandler.getModItem("TConstruct", "GlassBlock", 3L, 0), GT_ModHandler.getModItem("TConstruct", "GlassPane", 8L, 0), GT_Values.NI, 50, 8);
GT_Values.RA.addCutterRecipe(new ItemStack(Blocks.stone, 1, 0), new ItemStack(Blocks.stone_slab, 2, 0), GT_Values.NI, 25, 8);
GT_Values.RA.addCutterRecipe(new ItemStack(Blocks.sandstone, 1, 0), new ItemStack(Blocks.stone_slab, 2, 1), GT_Values.NI, 25, 8);
GT_Values.RA.addCutterRecipe(new ItemStack(Blocks.cobblestone, 1, 0), new ItemStack(Blocks.stone_slab, 2, 3), GT_Values.NI, 25, 8);
Expand Down Expand Up @@ -1396,7 +1396,7 @@ public void run2() {

GT_Values.RA.addLatheRecipe(new ItemStack(Blocks.wooden_slab, 1, GT_Values.W), new ItemStack(Items.bowl,1), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1), 50, 8);
GT_Values.RA.addLatheRecipe(GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "slabs", 1L, GT_Values.W), new ItemStack(Items.bowl,1), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1), 50, 8);
GT_Values.RA.addLatheRecipe(GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "woodslab", 1L, GT_Values.W), new ItemStack(Items.bowl,1), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1), 50, 8);
// GT_Values.RA.addLatheRecipe(GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextEBXL, "woodslab", 1L, GT_Values.W), new ItemStack(Items.bowl,1), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1), 50, 8);

GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Cupronickel, 1L), ItemList.Shape_Mold_Credit.get(0L), ItemList.Credit_Greg_Cupronickel.get(4L), 100, 16);
// GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Brass, 1L), ItemList.Shape_Mold_Credit.get(0L), ItemList.Coin_Doge.get(4L), 100, 16);
Expand Down

0 comments on commit 8db780d

Please sign in to comment.