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

@@ -5,23 +5,21 @@ import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
public class CraftingSlabItemBlock extends MultiItemBlock
{
public static final String blockTypes[] = { "tile.CraftingStation", "Crafter", "Parts", "PatternShaper", "PatternChest", "tile.ToolForge" };
public class CraftingSlabItemBlock extends MultiItemBlock {
public static final String blockTypes[] = {
"tile.CraftingStation", "Crafter", "Parts", "PatternShaper", "PatternChest", "tile.ToolForge"
};
public CraftingSlabItemBlock(Block b)
{
public CraftingSlabItemBlock(Block b) {
super(b, "ToolStation", blockTypes);
setMaxDamage(0);
setHasSubtypes(true);
}
@Override
public String getUnlocalizedName (ItemStack itemstack)
{
public String getUnlocalizedName(ItemStack itemstack) {
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, this.blockTypes.length - 1);
if (pos == 0 || pos == 5)
{
if (pos == 0 || pos == 5) {
return this.blockTypes[pos];
}
return super.getUnlocalizedName(itemstack);
@@ -8,12 +8,27 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
public class MultiBrickFancyItem extends MultiItemBlock
{
static String blockTypes[] = { "obsidian", "sandstone", "netherrack", "stone.refined", "iron", "gold", "lapis", "diamond", "redstone", "bone", "slime", "blueslime", "endstone", "obsidian.ingot", "stone", "stone.road" };
public class MultiBrickFancyItem extends MultiItemBlock {
static String blockTypes[] = {
"obsidian",
"sandstone",
"netherrack",
"stone.refined",
"iron",
"gold",
"lapis",
"diamond",
"redstone",
"bone",
"slime",
"blueslime",
"endstone",
"obsidian.ingot",
"stone",
"stone.road"
};
public MultiBrickFancyItem(Block b)
{
public MultiBrickFancyItem(Block b) {
super(b, "block.fancybrick", blockTypes);
setMaxDamage(0);
setHasSubtypes(true);
@@ -21,25 +36,23 @@ public class MultiBrickFancyItem extends MultiItemBlock
@Override
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
{
switch (stack.getItemDamage())
{
case 5:
case 6:
list.add(StatCollector.translateToLocal("fancybrick1.tooltip"));
break;
case 7:
list.add(StatCollector.translateToLocal("fancybrick2.tooltip"));
break;
case 8:
list.add(StatCollector.translateToLocal("fancybrick3.tooltip"));
list.add(StatCollector.translateToLocal("fancybrick4.tooltip"));
break;
case 10:
case 11:
list.add(StatCollector.translateToLocal("fancybrick5.tooltip"));
break;
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
switch (stack.getItemDamage()) {
case 5:
case 6:
list.add(StatCollector.translateToLocal("fancybrick1.tooltip"));
break;
case 7:
list.add(StatCollector.translateToLocal("fancybrick2.tooltip"));
break;
case 8:
list.add(StatCollector.translateToLocal("fancybrick3.tooltip"));
list.add(StatCollector.translateToLocal("fancybrick4.tooltip"));
break;
case 10:
case 11:
list.add(StatCollector.translateToLocal("fancybrick5.tooltip"));
break;
}
}
}
@@ -8,12 +8,27 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
public class MultiBrickItem extends MultiItemBlock
{
static String blockTypes[] = { "obsidian", "sandstone", "netherrack", "stone.refined", "iron", "gold", "lapis", "diamond", "redstone", "bone", "slime", "blueslime", "endstone", "obsidian.ingot", "stone.road", "stone.refined.road" };
public class MultiBrickItem extends MultiItemBlock {
static String blockTypes[] = {
"obsidian",
"sandstone",
"netherrack",
"stone.refined",
"iron",
"gold",
"lapis",
"diamond",
"redstone",
"bone",
"slime",
"blueslime",
"endstone",
"obsidian.ingot",
"stone.road",
"stone.refined.road"
};
public MultiBrickItem(Block b)
{
public MultiBrickItem(Block b) {
super(b, "block.brick", blockTypes);
setMaxDamage(0);
setHasSubtypes(true);
@@ -21,25 +36,23 @@ public class MultiBrickItem extends MultiItemBlock
@Override
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
{
switch (stack.getItemDamage())
{
case 5:
case 6:
list.add(StatCollector.translateToLocal("brick1.tooltip"));
break;
case 7:
list.add(StatCollector.translateToLocal("brick2.tooltip"));
break;
case 8:
list.add(StatCollector.translateToLocal("brick3.tooltip"));
list.add(StatCollector.translateToLocal("brick4.tooltip"));
break;
case 10:
case 11:
list.add(StatCollector.translateToLocal("brick5.tooltip"));
break;
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
switch (stack.getItemDamage()) {
case 5:
case 6:
list.add(StatCollector.translateToLocal("brick1.tooltip"));
break;
case 7:
list.add(StatCollector.translateToLocal("brick2.tooltip"));
break;
case 8:
list.add(StatCollector.translateToLocal("brick3.tooltip"));
list.add(StatCollector.translateToLocal("brick4.tooltip"));
break;
case 10:
case 11:
list.add(StatCollector.translateToLocal("brick5.tooltip"));
break;
}
}
}
@@ -4,10 +4,18 @@ import mantle.blocks.abstracts.MultiItemBlock;
import net.minecraft.block.Block;
public class MultiBrickMetalItem extends MultiItemBlock {
static String blockTypes[] = { "brick.alumite", "brick.ardite", "brick.cobalt", "brick.manyullyn", "fancybrick.alumite", "fancybrick.ardite", "fancybrick.cobalt", "fancybrick.manyullyn" };
static String blockTypes[] = {
"brick.alumite",
"brick.ardite",
"brick.cobalt",
"brick.manyullyn",
"fancybrick.alumite",
"fancybrick.ardite",
"fancybrick.cobalt",
"fancybrick.manyullyn"
};
public MultiBrickMetalItem(Block b)
{
public MultiBrickMetalItem(Block b) {
super(b, "block", blockTypes);
setMaxDamage(0);
setHasSubtypes(true);
@@ -3,12 +3,26 @@ package tconstruct.tools.itemblocks;
import mantle.blocks.abstracts.MultiItemBlock;
import net.minecraft.block.Block;
public class ToolStationItemBlock extends MultiItemBlock
{
public static final String blockTypes[] = { "Crafter", "Parts", "Parts", "Parts", "Parts", "PatternChest", "PatternChest", "PatternChest", "PatternChest", "PatternChest", "PatternShaper", "PatternShaper", "PatternShaper", "PatternShaper", "CastingTable" };
public class ToolStationItemBlock extends MultiItemBlock {
public static final String blockTypes[] = {
"Crafter",
"Parts",
"Parts",
"Parts",
"Parts",
"PatternChest",
"PatternChest",
"PatternChest",
"PatternChest",
"PatternChest",
"PatternShaper",
"PatternShaper",
"PatternShaper",
"PatternShaper",
"CastingTable"
};
public ToolStationItemBlock(Block b)
{
public ToolStationItemBlock(Block b) {
super(b, "ToolStation", blockTypes);
setMaxDamage(0);
setHasSubtypes(true);