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,46 +3,43 @@ package tconstruct.plugins;
import cpw.mods.fml.common.event.*;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
import mantle.pulsar.pulse.*;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import tconstruct.TConstruct;
import tconstruct.library.armor.ArmorPart;
import tconstruct.library.crafting.ModifyBuilder;
import tconstruct.modifiers.armor.AModBoolean;
import tconstruct.modifiers.armor.AModThaumicVision;
import tconstruct.world.TinkerWorld;
import thaumcraft.api.ItemApi;
import java.util.EnumSet;
@ObjectHolder(TConstruct.modID)
@Pulse(id = "Tinkers Thaumcraft Compatibility", description = "Tinkers Construct compatibility for Thaumcraft", modsRequired = "Thaumcraft", pulsesRequired = "Tinkers' World", forced = true)
public class TinkerThaumcraft
{
@Pulse(
id = "Tinkers Thaumcraft Compatibility",
description = "Tinkers Construct compatibility for Thaumcraft",
modsRequired = "Thaumcraft",
pulsesRequired = "Tinkers' World",
forced = true)
public class TinkerThaumcraft {
@Handler
public void init (FMLInitializationEvent event)
{
public void init(FMLInitializationEvent event) {
TConstruct.logger.info("Thaumcraft detected. Registering harvestables.");
sendIMC();
registerModifiers();
}
private void sendIMC()
{
private void sendIMC() {
FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 12));
FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 13));
FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 14));
FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 15));
FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerrySecond, 1, 12));
FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerrySecond, 1, 13));
FMLInterModComms.sendMessage(
"Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerrySecond, 1, 12));
FMLInterModComms.sendMessage(
"Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerrySecond, 1, 13));
}
private void registerModifiers()
{
private void registerModifiers() {
ItemStack thaumometer = ItemApi.getItem("itemThaumometer", 0);
if(thaumometer != null) {
if (thaumometer != null) {
// Thaumometer Vision!
ModifyBuilder.registerModifier(new AModThaumicVision(thaumometer));
}