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

@@ -18,30 +18,79 @@ import tconstruct.tools.TinkerTools;
import tconstruct.world.TinkerWorld;
@ObjectHolder(TConstruct.modID)
@Pulse(id = "Tinkers TE4 Compatibility", description = "Tinkers Construct compatibility for Thermal Expansion", modsRequired = "ThermalExpansion", forced = true)
public class TinkerTE4
{
@Pulse(
id = "Tinkers TE4 Compatibility",
description = "Tinkers Construct compatibility for Thermal Expansion",
modsRequired = "ThermalExpansion",
forced = true)
public class TinkerTE4 {
@Handler
public void init ()
{
public void init() {
TConstruct.logger.info("Thermal Expansion detected. Adding Pulverizer & Induction Smelter recipes");
ItemStack crystalCinnabar = OreDictionary.getOres("crystalCinnabar").get(0);
TE4Helper.addPulverizerRecipe(1000, new ItemStack(TinkerTools.materials, 1, 11), new ItemStack(TinkerTools.materials, 1, 40), null, 0);
TE4Helper.addPulverizerRecipe(1000, new ItemStack(TinkerTools.materials, 1, 3), new ItemStack(TinkerTools.materials, 1, 39), null, 0);
TE4Helper.addPulverizerRecipe(1000, new ItemStack(TinkerTools.materials, 1, 4), new ItemStack(TinkerTools.materials, 1, 38), null, 0);
TE4Helper.addPulverizerRecipe(
1000,
new ItemStack(TinkerTools.materials, 1, 11),
new ItemStack(TinkerTools.materials, 1, 40),
null,
0);
TE4Helper.addPulverizerRecipe(
1000, new ItemStack(TinkerTools.materials, 1, 3), new ItemStack(TinkerTools.materials, 1, 39), null, 0);
TE4Helper.addPulverizerRecipe(
1000, new ItemStack(TinkerTools.materials, 1, 4), new ItemStack(TinkerTools.materials, 1, 38), null, 0);
TE4Helper.addPulverizerRecipe(12000, new ItemStack(TinkerWorld.oreSlag, 1, 1), new ItemStack(TinkerTools.materials, 2, 39), GameRegistry.findItemStack("ThermalExpansion", "dustIron", 1), 10);
TE4Helper.addSmelterRecipe(12000, new ItemStack(TinkerWorld.oreSlag, 1, 1), crystalCinnabar.copy(), new ItemStack(TinkerTools.materials, 3, 3), new ItemStack(Items.iron_ingot), 100);
TE4Helper.addPulverizerRecipe(12000, new ItemStack(TinkerWorld.oreSlag, 1, 2), new ItemStack(TinkerTools.materials, 2, 38), GameRegistry.findItemStack("ThermalExpansion", "dustGold", 1), 10);
TE4Helper.addSmelterRecipe(12000, new ItemStack(TinkerWorld.oreSlag, 1, 2), crystalCinnabar.copy(), new ItemStack(TinkerTools.materials, 3, 4), new ItemStack(Items.gold_ingot), 100);
TE4Helper.addPulverizerRecipe(
12000,
new ItemStack(TinkerWorld.oreSlag, 1, 1),
new ItemStack(TinkerTools.materials, 2, 39),
GameRegistry.findItemStack("ThermalExpansion", "dustIron", 1),
10);
TE4Helper.addSmelterRecipe(
12000,
new ItemStack(TinkerWorld.oreSlag, 1, 1),
crystalCinnabar.copy(),
new ItemStack(TinkerTools.materials, 3, 3),
new ItemStack(Items.iron_ingot),
100);
TE4Helper.addPulverizerRecipe(
12000,
new ItemStack(TinkerWorld.oreSlag, 1, 2),
new ItemStack(TinkerTools.materials, 2, 38),
GameRegistry.findItemStack("ThermalExpansion", "dustGold", 1),
10);
TE4Helper.addSmelterRecipe(
12000,
new ItemStack(TinkerWorld.oreSlag, 1, 2),
crystalCinnabar.copy(),
new ItemStack(TinkerTools.materials, 3, 4),
new ItemStack(Items.gold_ingot),
100);
TE4Helper.addSmelterRecipe(4000, new ItemStack(TinkerTools.materials, 1, 4), new ItemStack(TinkerTools.materials, 1, 3), new ItemStack(TinkerTools.materials, 1, 5), null, 0);
TE4Helper.addSmelterRecipe(4000, new ItemStack(TinkerTools.materials, 1, 9), new ItemStack(TinkerTools.materials, 3, 11), new ItemStack(TinkerTools.materials, 4, 14), null, 0);
TE4Helper.addSmelterRecipe(
4000,
new ItemStack(TinkerTools.materials, 1, 4),
new ItemStack(TinkerTools.materials, 1, 3),
new ItemStack(TinkerTools.materials, 1, 5),
null,
0);
TE4Helper.addSmelterRecipe(
4000,
new ItemStack(TinkerTools.materials, 1, 9),
new ItemStack(TinkerTools.materials, 3, 11),
new ItemStack(TinkerTools.materials, 4, 14),
null,
0);
// Dust Recipes
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 1, 41), "dustArdite", "dustCobalt"));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 4, 42), "dustAluminum", "dustAluminum", "dustAluminum", "dustCopper"));
GameRegistry.addRecipe(
new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 1, 41), "dustArdite", "dustCobalt"));
GameRegistry.addRecipe(new ShapelessOreRecipe(
new ItemStack(TinkerTools.materials, 4, 42),
"dustAluminum",
"dustAluminum",
"dustAluminum",
"dustCopper"));
}
@Handler
@@ -52,40 +101,47 @@ public class TinkerTE4
// selected fluid transposer recipies
// tesseract
ItemStack tesseractEmpty = GameRegistry.findItemStack("ThermalExpansion", "frameTesseractEmpty" ,1);
ItemStack tesseractFull = GameRegistry.findItemStack("ThermalExpansion", "frameTesseractFull" ,1);
TConstructRegistry.getBasinCasting().addCastingRecipe(tesseractFull, new FluidStack(enderFluid, 1000), tesseractEmpty, true, 300);
ItemStack tesseractEmpty = GameRegistry.findItemStack("ThermalExpansion", "frameTesseractEmpty", 1);
ItemStack tesseractFull = GameRegistry.findItemStack("ThermalExpansion", "frameTesseractFull", 1);
TConstructRegistry.getBasinCasting()
.addCastingRecipe(tesseractFull, new FluidStack(enderFluid, 1000), tesseractEmpty, true, 300);
// redstone energy cell
ItemStack cellFrameEmpty = GameRegistry.findItemStack("ThermalExpansion", "frameCellReinforcedEmpty", 1);
ItemStack cellFrameFull = GameRegistry.findItemStack("ThermalExpansion", "frameCellReinforcedFull", 1);
TConstructRegistry.getBasinCasting().addCastingRecipe(cellFrameFull, new FluidStack(redstoneFluid, 4000), cellFrameEmpty, true, 100);
TConstructRegistry.getBasinCasting()
.addCastingRecipe(cellFrameFull, new FluidStack(redstoneFluid, 4000), cellFrameEmpty, true, 100);
cellFrameEmpty = GameRegistry.findItemStack("ThermalExpansion", "frameCellResonantEmpty", 1);
if(cellFrameEmpty != null) {
if (cellFrameEmpty != null) {
cellFrameFull = GameRegistry.findItemStack("ThermalExpansion", "frameCellResonantFull", 1);
TConstructRegistry.getBasinCasting().addCastingRecipe(cellFrameFull, new FluidStack(redstoneFluid, 4000), cellFrameEmpty, true, 100);
TConstructRegistry.getBasinCasting()
.addCastingRecipe(cellFrameFull, new FluidStack(redstoneFluid, 4000), cellFrameEmpty, true, 100);
}
// glowstone illuminator
ItemStack illuminatorEmpty = GameRegistry.findItemStack("ThermalExpansion", "frameIlluminator" ,1);
ItemStack illuminator = GameRegistry.findItemStack("ThermalExpansion", "illuminator" ,1);
TConstructRegistry.getBasinCasting().addCastingRecipe(illuminator, new FluidStack(glowstoneFluid, 1000), illuminatorEmpty, true, 300);
ItemStack illuminatorEmpty = GameRegistry.findItemStack("ThermalExpansion", "frameIlluminator", 1);
ItemStack illuminator = GameRegistry.findItemStack("ThermalExpansion", "illuminator", 1);
TConstructRegistry.getBasinCasting()
.addCastingRecipe(illuminator, new FluidStack(glowstoneFluid, 1000), illuminatorEmpty, true, 300);
// plates
ItemStack plate = GameRegistry.findItemStack("ThermalExpansion", "plateFrame" ,1);
ItemStack plateRedstone = GameRegistry.findItemStack("ThermalExpansion", "plateSignal" ,1);
ItemStack plateGlowstone = GameRegistry.findItemStack("ThermalExpansion", "plateImpulse" ,1);
ItemStack plateEnder = GameRegistry.findItemStack("ThermalExpansion", "plateTranslocate" ,1);
ItemStack plate = GameRegistry.findItemStack("ThermalExpansion", "plateFrame", 1);
ItemStack plateRedstone = GameRegistry.findItemStack("ThermalExpansion", "plateSignal", 1);
ItemStack plateGlowstone = GameRegistry.findItemStack("ThermalExpansion", "plateImpulse", 1);
ItemStack plateEnder = GameRegistry.findItemStack("ThermalExpansion", "plateTranslocate", 1);
TConstructRegistry.getTableCasting().addCastingRecipe(plateRedstone, new FluidStack(redstoneFluid, 1000), plate, true, 100);
TConstructRegistry.getTableCasting().addCastingRecipe(plateGlowstone, new FluidStack(glowstoneFluid, 1000), plate, true, 100);
TConstructRegistry.getTableCasting().addCastingRecipe(plateEnder, new FluidStack(enderFluid, 1000), plate, true, 100);
TConstructRegistry.getTableCasting()
.addCastingRecipe(plateRedstone, new FluidStack(redstoneFluid, 1000), plate, true, 100);
TConstructRegistry.getTableCasting()
.addCastingRecipe(plateGlowstone, new FluidStack(glowstoneFluid, 1000), plate, true, 100);
TConstructRegistry.getTableCasting()
.addCastingRecipe(plateEnder, new FluidStack(enderFluid, 1000), plate, true, 100);
// last but not least.. a really weird hardened glass recipe
ItemStack hardenedGlass = GameRegistry.findItemStack("ThermalExpansion", "blockGlassHardened" ,1);
ItemStack hardenedGlass = GameRegistry.findItemStack("ThermalExpansion", "blockGlassHardened", 1);
ItemStack obsidian = new ItemStack(Blocks.obsidian);
FluidStack lead = new FluidStack(TinkerSmeltery.moltenLeadFluid, TConstruct.ingotLiquidValue/2);
FluidStack lead = new FluidStack(TinkerSmeltery.moltenLeadFluid, TConstruct.ingotLiquidValue / 2);
TConstructRegistry.getBasinCasting().addCastingRecipe(hardenedGlass, lead, obsidian, true, 150);
}
}