Fix JABBA-related issues with crafting station slots (#54)

* Fix shift-merging tools voiding items

fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11392>

* Change 0-sized ItemStacks into null stacks in crafting station attached slots

Fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10425>

* Update buildscript

* spotlessApply
This commit is contained in:
Raven Szewczyk authored and GitHub committed 2022-09-22 20:51:23 +02:00
1 parent 18bfeaff32
commit 39be06c23b
571 files changed
+25959 -28223

No files matched your search

@@ -3,6 +3,7 @@ package tconstruct.plugins.gears;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.registry.GameRegistry;
import java.util.List;
import mantle.pulsar.pulse.Handler;
import mantle.pulsar.pulse.Pulse;
import net.minecraft.item.Item;
@@ -16,14 +17,12 @@ import tconstruct.library.TConstructRegistry;
import tconstruct.library.crafting.FluidType;
import tconstruct.library.crafting.Smeltery;
import tconstruct.smeltery.TinkerSmeltery;
import tconstruct.tools.items.Pattern;
import tconstruct.util.config.PHConstruct;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@Pulse(id = "Tinkers Gears", description = "Adds a gear cast if other mods provide gears", pulsesRequired = "Tinkers' Smeltery")
@Pulse(
id = "Tinkers Gears",
description = "Adds a gear cast if other mods provide gears",
pulsesRequired = "Tinkers' Smeltery")
public class TinkerGears {
public static Item gearCast;
@@ -40,22 +39,21 @@ public class TinkerGears {
ItemStack cast = new ItemStack(gearCast);
FluidStack aluCastLiquid = new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue);
FluidStack goldCastLiquid = null;
if(!PHConstruct.removeGoldCastRecipes) {
goldCastLiquid = new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue*2);
if (!PHConstruct.removeGoldCastRecipes) {
goldCastLiquid = new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2);
}
// find all gears in the registry
for(String oreName : OreDictionary.getOreNames()) {
if(!oreName.startsWith("gear"))
continue;
for (String oreName : OreDictionary.getOreNames()) {
if (!oreName.startsWith("gear")) continue;
List<ItemStack> gears = OreDictionary.getOres(oreName);
// register every gear besides wooden gear for creating a gear cast
if(!oreName.equals("gearWood")) {
for(ItemStack g : gears) {
if (!oreName.equals("gearWood")) {
for (ItemStack g : gears) {
TConstructRegistry.getTableCasting().addCastingRecipe(cast, aluCastLiquid, g, false, 50);
if(!PHConstruct.removeGoldCastRecipes)
if (!PHConstruct.removeGoldCastRecipes)
TConstructRegistry.getTableCasting().addCastingRecipe(cast, goldCastLiquid, g, false, 50);
}
}
@@ -65,24 +63,20 @@ public class TinkerGears {
// try the oredict name directly
Fluid fluid = FluidRegistry.getFluid(material);
// or lowercased
if(fluid == null)
fluid = FluidRegistry.getFluid(material.toLowerCase());
if (fluid == null) fluid = FluidRegistry.getFluid(material.toLowerCase());
// or in the tinkers liquid format
if(fluid == null)
fluid = FluidRegistry.getFluid(material.toLowerCase() + ".molten");
if (fluid == null) fluid = FluidRegistry.getFluid(material.toLowerCase() + ".molten");
// found one?
if(fluid != null) {
if (fluid != null) {
ItemStack gear = gears.get(0);
FluidStack liquid = new FluidStack(fluid.getID(), TConstruct.ingotLiquidValue*4);
FluidStack liquid = new FluidStack(fluid.getID(), TConstruct.ingotLiquidValue * 4);
// gear casting
TConstructRegistry.getTableCasting().addCastingRecipe(gear, liquid, cast, 55);
// and melting it back
FluidType ft = FluidType.getFluidType(fluid);
if(ft != null)
Smeltery.addMelting(ft, gear, 100, TConstruct.ingotLiquidValue*4);
else
Smeltery.addMelting(gear, TinkerSmeltery.glueBlock, 0, 100, liquid);
if (ft != null) Smeltery.addMelting(ft, gear, 100, TConstruct.ingotLiquidValue * 4);
else Smeltery.addMelting(gear, TinkerSmeltery.glueBlock, 0, 100, liquid);
}
}
}