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

+60 -80
View File
@@ -12,14 +12,14 @@ import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.VillagerRegistry;
import cpw.mods.fml.relauncher.Side;
import java.util.Map;
import java.util.Random;
import mantle.pulsar.config.ForgeCFG;
import mantle.pulsar.control.PulseManager;
import net.minecraft.world.gen.structure.MapGenStructureIO;
import net.minecraftforge.common.MinecraftForge;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import tconstruct.achievements.AchievementEvents;
import tconstruct.achievements.TAchievements;
import tconstruct.api.TConstructAPI;
@@ -36,13 +36,13 @@ import tconstruct.library.crafting.LiquidCasting;
import tconstruct.mechworks.TinkerMechworks;
import tconstruct.mechworks.landmine.behavior.Behavior;
import tconstruct.mechworks.landmine.behavior.stackCombo.SpecialStackHandler;
import tconstruct.plugins.gears.TinkerGears;
import tconstruct.plugins.TinkerThaumcraft;
import tconstruct.plugins.fmp.TinkerFMP;
import tconstruct.plugins.gears.TinkerGears;
import tconstruct.plugins.ic2.TinkerIC2;
import tconstruct.plugins.imc.TinkerAE2;
import tconstruct.plugins.imc.TinkerBuildCraft;
import tconstruct.plugins.imc.TinkerMystcraft;
import tconstruct.plugins.TinkerThaumcraft;
import tconstruct.plugins.imc.TinkerRfTools;
import tconstruct.plugins.mfr.TinkerMFR;
import tconstruct.plugins.te4.TinkerTE4;
@@ -61,51 +61,48 @@ import tconstruct.world.TinkerWorld;
import tconstruct.world.gen.SlimeIslandGen;
import tconstruct.world.village.*;
import java.util.Map;
import java.util.Random;
/**
* TConstruct, the tool mod. Craft your tools with style, then modify until the
* original is gone!
*
*
* @author mDiyo
*/
@Mod(modid = TConstruct.modID, name = "TConstruct", version = TConstruct.modVersion,
dependencies = "required-after:Forge@[10.13.3.1384,11.14);" +
"required-after:Mantle@[0.3.2,1.7.10),[1.7.10-0.3.2,);" + //make sure we still have the 0.3.2 requirement, even without the 1.7.10 prefix
"after:MineFactoryReloaded@[1.7.10R2.8.0RC7,);" +
"after:ThermalExpansion@[1.7.10R4.0.0RC2,);" +
"after:ThermalFoundation@[1.7.10R1.0.0RC3,);" +
"after:armourersWorkshop@[1.7.10-0.28.0,);" +
"after:CoFHAPI|energy;" +
"after:CoFHCore;" +
"after:battlegear2;" +
"after:ZeldaItemAPI;" +
"after:DynamicSkillsAPI;" +
"after:NotEnoughItems;" +
"after:Waila;" +
"before:GalacticraftCore;" +
"before:UndergroundBiomes"
)
public class TConstruct
{
@Mod(
modid = TConstruct.modID,
name = "TConstruct",
version = TConstruct.modVersion,
dependencies =
"required-after:Forge@[10.13.3.1384,11.14);" + "required-after:Mantle@[0.3.2,1.7.10),[1.7.10-0.3.2,);"
+ // make sure we still have the 0.3.2 requirement, even without the 1.7.10 prefix
"after:MineFactoryReloaded@[1.7.10R2.8.0RC7,);"
+ "after:ThermalExpansion@[1.7.10R4.0.0RC2,);"
+ "after:ThermalFoundation@[1.7.10R1.0.0RC3,);"
+ "after:armourersWorkshop@[1.7.10-0.28.0,);"
+ "after:CoFHAPI|energy;"
+ "after:CoFHCore;"
+ "after:battlegear2;"
+ "after:ZeldaItemAPI;"
+ "after:DynamicSkillsAPI;"
+ "after:NotEnoughItems;"
+ "after:Waila;"
+ "before:GalacticraftCore;"
+ "before:UndergroundBiomes")
public class TConstruct {
public static final String modVersion = "GRADLETOKEN_VERSION";
/** The value of one ingot in millibuckets */
public static final int ingotLiquidValue = 144;
public static final int oreLiquidValue = ingotLiquidValue * 2;
public static final int blockLiquidValue = ingotLiquidValue * 9;
public static final int chunkLiquidValue = ingotLiquidValue / 2;
public static final int nuggetLiquidValue = ingotLiquidValue / 9;
public static final int stoneLiquidValue = ingotLiquidValue/8;
public static final int stoneLiquidValue = ingotLiquidValue / 8;
public static final int liquidUpdateAmount = 6;
public static final String modID = "TConstruct";
public static final Logger logger = LogManager.getLogger(modID);
public static final PacketPipeline packetPipeline = new PacketPipeline();
public static Random random = new Random();
/* Instance of this mod, used for grabbing prototype fields */
@Instance(modID)
@@ -115,33 +112,28 @@ public class TConstruct
public static TProxyCommon proxy;
/* Loads modules in a way that doesn't clutter the @Mod list */
public static PulseManager pulsar = new PulseManager(modID, new ForgeCFG("TinkersModules", "Modules: Disabling these will disable a chunk of the mod"));
public static PulseManager pulsar = new PulseManager(
modID, new ForgeCFG("TinkersModules", "Modules: Disabling these will disable a chunk of the mod"));
public TConstruct()
{
if (Loader.isModLoaded("Natura"))
{
public TConstruct() {
if (Loader.isModLoaded("Natura")) {
logger.info("Natura, what are we going to do tomorrow night?");
LogManager.getLogger("Natura").info("TConstruct, we're going to take over the world!");
}
else
{
} else {
logger.info("Preparing to take over the world");
}
EnvironmentChecks.verifyEnvironmentSanity();
}
//Force the client and server to have or not have this mod
// Force the client and server to have or not have this mod
@NetworkCheckHandler()
public boolean matchModVersions (Map<String, String> remoteVersions, Side side)
{
public boolean matchModVersions(Map<String, String> remoteVersions, Side side) {
return remoteVersions.containsKey("TConstruct") && modVersion.equals(remoteVersions.get("TConstruct"));
}
@EventHandler
public void preInit (FMLPreInitializationEvent event)
{
public void preInit(FMLPreInitializationEvent event) {
PHConstruct.initProps(event.getModConfigurationDirectory());
pulsar.registerPulse(new TinkerWorld());
@@ -179,7 +171,7 @@ public class TConstruct
basinCasting = new LiquidCasting();
chiselDetailing = new Detailing();
//GameRegistry.registerFuelHandler(content);
// GameRegistry.registerFuelHandler(content);
playerTracker = new TPlayerHandler();
// GameRegistry.registerPlayerTracker(playerTracker);
@@ -189,22 +181,20 @@ public class TConstruct
pulsar.preInit(event);
if (PHConstruct.achievementsEnabled)
{
if (PHConstruct.achievementsEnabled) {
TAchievements.addDefaultAchievements();
}
if (PHConstruct.addToVillages)
{
if (PHConstruct.addToVillages) {
// adds to the villager spawner egg
VillagerRegistry.instance().registerVillagerId(78943);
// moved down, not needed if 'addToVillages' is false
if(PHConstruct.allowVillagerTrading)
if (PHConstruct.allowVillagerTrading)
VillagerRegistry.instance().registerVillageTradeHandler(78943, new TVillageTrades());
VillagerRegistry.instance().registerVillageCreationHandler(new VillageToolStationHandler());
MapGenStructureIO.func_143031_a(ComponentToolWorkshop.class, "TConstruct:ToolWorkshopStructure");
if(pulsar.isPulseLoaded("Tinkers' Smeltery")) {
if (pulsar.isPulseLoaded("Tinkers' Smeltery")) {
VillagerRegistry.instance().registerVillageCreationHandler(new VillageSmelteryHandler());
MapGenStructureIO.func_143031_a(ComponentSmeltery.class, "TConstruct:SmelteryStructure");
}
@@ -214,12 +204,10 @@ public class TConstruct
}
@EventHandler
public void init (FMLInitializationEvent event)
{
public void init(FMLInitializationEvent event) {
packetPipeline.initalise();
if (event.getSide() == Side.CLIENT)
{
//MinecraftForge.EVENT_BUS.register(new EventCloakRender());
if (event.getSide() == Side.CLIENT) {
// MinecraftForge.EVENT_BUS.register(new EventCloakRender());
}
DimensionBlacklist.getBadBimensions();
@@ -229,8 +217,7 @@ public class TConstruct
}
@EventHandler
public void postInit (FMLPostInitializationEvent event)
{
public void postInit(FMLPostInitializationEvent event) {
packetPipeline.postInitialise();
Behavior.registerBuiltInBehaviors();
SpecialStackHandler.registerBuiltInStackHandlers();
@@ -238,45 +225,39 @@ public class TConstruct
proxy.initialize();
pulsar.postInit(event);
if (PHConstruct.achievementsEnabled)
{
if (PHConstruct.achievementsEnabled) {
TAchievements.registerAchievementPane();
MinecraftForge.EVENT_BUS.register(new AchievementEvents());
}
}
/** Called on server shutdown to prevent memory leaks */
@EventHandler
public void serverStopping(FMLServerStoppingEvent event) {
TinkerGadgets.log.info("Cleaning up SlimeBounceHandler data.");
SlimeBounceHandler.BOUNCING_ENTITIES.clear();
}
/** Called on server shutdown to prevent memory leaks */
@EventHandler
public void serverStopping(FMLServerStoppingEvent event) {
TinkerGadgets.log.info("Cleaning up SlimeBounceHandler data.");
SlimeBounceHandler.BOUNCING_ENTITIES.clear();
}
/* IMC Mod Support */
@EventHandler
public void handleIMC(FMLInterModComms.IMCEvent e)
{
public void handleIMC(FMLInterModComms.IMCEvent e) {
IMCHandler.processIMC(e.getMessages());
}
@EventHandler
public void loadComplete(FMLLoadCompleteEvent evt)
{
public void loadComplete(FMLLoadCompleteEvent evt) {
IMCHandler.processIMC(FMLInterModComms.fetchRuntimeMessages(this));
}
public static LiquidCasting getTableCasting ()
{
public static LiquidCasting getTableCasting() {
return tableCasting;
}
public static LiquidCasting getBasinCasting ()
{
public static LiquidCasting getBasinCasting() {
return basinCasting;
}
public static Detailing getChiselDetailing ()
{
public static Detailing getChiselDetailing() {
return chiselDetailing;
}
@@ -288,9 +269,8 @@ public class TConstruct
@Mod.EventHandler
public void missingMapping(FMLMissingMappingsEvent event) {
// this will be called because the air-block got removed
for(FMLMissingMappingsEvent.MissingMapping mapping : event.get()) {
if(mapping.name.equals("TConstruct:TankAir"))
mapping.ignore();
for (FMLMissingMappingsEvent.MissingMapping mapping : event.get()) {
if (mapping.name.equals("TConstruct:TankAir")) mapping.ignore();
}
}
}