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

@@ -9,48 +9,47 @@ import tconstruct.smeltery.TinkerSmeltery;
import tconstruct.tools.TinkerTools;
import tconstruct.world.TinkerWorld;
@Pulse(id = "Tinkers FMP Compatibility", description = "Makes Tinkers Blocks Multipart compatible", modsRequired = "ForgeMultipart", forced = true)
@Pulse(
id = "Tinkers FMP Compatibility",
description = "Makes Tinkers Blocks Multipart compatible",
modsRequired = "ForgeMultipart",
forced = true)
public class TinkerFMP {
@Handler
public void init(FMLInitializationEvent event)
{
public void init(FMLInitializationEvent event) {
TConstruct.logger.info("ForgeMultipart detected. Registering TConstruct decorative blocks with FMP.");
//make Tconstruct blocks multipartable!
if(TinkerWorld.metalBlock != null) {
// make Tconstruct blocks multipartable!
if (TinkerWorld.metalBlock != null) {
// metal blocks
for (int i = 0; i < 11; i++)
BlockMicroMaterial.createAndRegister(TinkerWorld.metalBlock, i);
for (int i = 0; i < 11; i++) BlockMicroMaterial.createAndRegister(TinkerWorld.metalBlock, i);
}
if(TinkerSmeltery.smeltery != null) {
if (TinkerSmeltery.smeltery != null) {
// smeltery bricks
for (int i = 2; i < 12; i++) {
if (i == 3)
continue;
if (i == 3) continue;
BlockMicroMaterial.createAndRegister(TinkerSmeltery.smeltery, i);
BlockMicroMaterial.createAndRegister(TinkerSmeltery.smelteryNether, i, TinkerSmeltery.smelteryNether.getUnlocalizedName() + "Nether");
BlockMicroMaterial.createAndRegister(
TinkerSmeltery.smelteryNether,
i,
TinkerSmeltery.smelteryNether.getUnlocalizedName() + "Nether");
}
// brownstone
for (int i = 0; i < 7; i++)
BlockMicroMaterial.createAndRegister(TinkerSmeltery.speedBlock, i);
for (int i = 0; i < 7; i++) BlockMicroMaterial.createAndRegister(TinkerSmeltery.speedBlock, i);
// clear glass
BlockMicroMaterial.createAndRegister(TinkerSmeltery.clearGlass, 0);
for (int i = 0; i < 16; i++)
BlockMicroMaterial.createAndRegister(TinkerSmeltery.stainedGlassClear, i);
for (int i = 0; i < 16; i++) BlockMicroMaterial.createAndRegister(TinkerSmeltery.stainedGlassClear, i);
}
if(TinkerTools.multiBrick != null) {
if (TinkerTools.multiBrick != null) {
// chisel bricks
for (int i = 0; i < 14; i++)
BlockMicroMaterial.createAndRegister(TinkerTools.multiBrick, i);
for (int i = 0; i < 14; i++) BlockMicroMaterial.createAndRegister(TinkerTools.multiBrick, i);
for (int i = 0; i < 16; i++)
BlockMicroMaterial.createAndRegister(TinkerTools.multiBrickFancy, i);
for (int i = 0; i < 16; i++) BlockMicroMaterial.createAndRegister(TinkerTools.multiBrickFancy, i);
}
}
}