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

@@ -7,37 +7,56 @@ import mantle.pulsar.pulse.*;
import tconstruct.TConstruct;
@ObjectHolder(TConstruct.modID)
@Pulse(id = "Tinkers AE2 Compatibility", description = "Tinkers Construct compatibility for Applied Energistics 2", modsRequired = "appliedenergistics2", forced = true)
public class TinkerAE2
{
private static List<String> spatialIOLogics = Arrays.asList("EssenceExtractorLogic", "GolemPedestalLogic", //TODO What happened to these?
"MultiServantLogic"); //TODO Should Mantle handle this?
@Pulse(
id = "Tinkers AE2 Compatibility",
description = "Tinkers Construct compatibility for Applied Energistics 2",
modsRequired = "appliedenergistics2",
forced = true)
public class TinkerAE2 {
private static List<String> spatialIOLogics = Arrays.asList(
"EssenceExtractorLogic",
"GolemPedestalLogic", // TODO What happened to these?
"MultiServantLogic"); // TODO Should Mantle handle this?
private static List<String> spatialIOSmelteryLogics = Arrays.asList("AdaptiveSmelteryLogic", "AqueductLogic", "CastingBasinLogic", "CastingChannelLogic", "CastingTableLogic", "FaucetLogic", "LavaTankLogic", "SmelteryDrainLogic", "SmelteryLogic", "TankAirLogic", "TowerFurnaceLogic");
private static List<String> spatialIOSmelteryLogics = Arrays.asList(
"AdaptiveSmelteryLogic",
"AqueductLogic",
"CastingBasinLogic",
"CastingChannelLogic",
"CastingTableLogic",
"FaucetLogic",
"LavaTankLogic",
"SmelteryDrainLogic",
"SmelteryLogic",
"TankAirLogic",
"TowerFurnaceLogic");
private static List<String> spatialIOToolLogics = Arrays.asList("CraftingStationLogic", "FrypanLogic", "PartBuilderLogic", "PatternChestLogic", "StencilTableLogic", "ToolForgeLogic", "ToolStationLogic");
private static List<String> spatialIOToolLogics = Arrays.asList(
"CraftingStationLogic",
"FrypanLogic",
"PartBuilderLogic",
"PatternChestLogic",
"StencilTableLogic",
"ToolForgeLogic",
"ToolStationLogic");
@Handler
public void init (FMLInitializationEvent event)
{
public void init(FMLInitializationEvent event) {
TConstruct.logger.info("AE2 detected. Registering for Spatial IO.");
addtoSpatialWhitelist("tconstruct.blocks.logic.DryingRackLogic");
addtoSpatialWhitelist("tconstruct.mechworks.logic.TileEntityLandmine");
for (String s : spatialIOSmelteryLogics)
{
for (String s : spatialIOSmelteryLogics) {
addtoSpatialWhitelist("tconstruct.smeltery.logic." + s);
}
for (String s : spatialIOToolLogics)
{
for (String s : spatialIOToolLogics) {
addtoSpatialWhitelist("tconstruct.tools.logic." + s);
}
}
public void addtoSpatialWhitelist (String teClass)
{
public void addtoSpatialWhitelist(String teClass) {
FMLInterModComms.sendMessage("appliedenergistics2", "whitelist-spatial", teClass);
}
}