quick fix : Access static member via instance reference

This commit is contained in:
Alexdoru committed 2023-01-25 23:02:19 +01:00
1 parent 1528c21fae
commit 06c95eeb39
12 files changed
+38 -39

No files matched your search

@@ -99,7 +99,7 @@ public class Landmine extends MantleBlock {
*/
@Override
public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) {
return par1World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4)
return World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4)
|| BlockFence.func_149825_a(par1World.getBlock(par2, par3 - 1, par4));
}
@@ -111,7 +111,7 @@ public class Landmine extends MantleBlock {
public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, Block par5) {
boolean var6 = false;
if (!par1World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4)
if (!World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4)
&& !BlockFence.func_149825_a(par1World.getBlock(par2, par3 - 1, par4))) {
var6 = true;
}
@@ -193,7 +193,7 @@ public class TConstructRegistry {
ToolBuilder tb = ToolBuilder.instance;
if (parts.length < 2 || parts.length > 4) logger.warn("Wrong amount of items to craft into a tool");
tb.addToolRecipe(output, parts);
ToolBuilder.addToolRecipe(output, parts);
}
// Materials
@@ -133,7 +133,7 @@ public class Smeltery {
* @return The result ItemStack
*/
public static Integer getLiquifyTemperature(Block block, int metadata) {
return instance.getLiquifyTemperature(new ItemStack(block, 1, metadata));
return getLiquifyTemperature(new ItemStack(block, 1, metadata));
}
/**
@@ -157,7 +157,7 @@ public class Smeltery {
* @return The result ItemStack
*/
public static FluidStack getSmelteryResult(Block block, int metadata) {
return instance.getSmelteryResult(new ItemStack(block, 1, metadata));
return getSmelteryResult(new ItemStack(block, 1, metadata));
}
public static ItemStack getRenderIndex(ItemStack input) {
@@ -616,7 +616,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq
nearbyStack = player.inventory.getStackInSlot(itemSlot);
if (nearbyStack != null) {
Item item = nearbyStack.getItem();
if (item instanceof ItemPotion && ((ItemPotion) item).isSplash(nearbyStack.getItemDamage())) {
if (item instanceof ItemPotion && ItemPotion.isSplash(nearbyStack.getItemDamage())) {
nearbyStack = item.onItemRightClick(nearbyStack, world, player);
if (nearbyStack.stackSize < 1) {
nearbyStack = null;
@@ -18,10 +18,10 @@ public class SpecialStackHandlerRocketFireball extends SpecialStackHandler {
return;
}
if (this.arrayContainsEqualStack(stacks, new ItemStack(Items.fireworks))
&& this.arrayContainsEqualStack(stacks, new ItemStack(Items.fire_charge))) {
int index0 = this.arrayIndexOfStack(stacks, new ItemStack(Items.fireworks));
int index1 = this.arrayIndexOfStack(stacks, new ItemStack(Items.fire_charge));
if (arrayContainsEqualStack(stacks, new ItemStack(Items.fireworks))
&& arrayContainsEqualStack(stacks, new ItemStack(Items.fire_charge))) {
int index0 = arrayIndexOfStack(stacks, new ItemStack(Items.fireworks));
int index1 = arrayIndexOfStack(stacks, new ItemStack(Items.fire_charge));
EnumFacing face = getFacing(par1World, par2, par3, par4);
while (stacks.get(index0).stackSize > 0 && stacks.get(index1).stackSize > 0) {
@@ -932,7 +932,7 @@ public class TinkerSmeltery {
ItemStack ingotcast_clay = new ItemStack(TinkerSmeltery.clayPattern, 1, 0);
ItemStack gemcast_clay = new ItemStack(TinkerSmeltery.clayPattern, 1, 26);
LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting();
LiquidCasting tableCasting = TConstructRegistry.getTableCasting();
// Blank
tableCasting.addCastingRecipe(
new ItemStack(TinkerTools.blankPattern, 1, 1),
@@ -1815,7 +1815,7 @@ public class TinkerSmeltery {
private void registerIngotCasting(FluidType ft, String name) {
ItemStack pattern = new ItemStack(TinkerSmeltery.metalPattern, 1, 0);
LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting();
LiquidCasting tableCasting = TConstructRegistry.getTableCasting();
for (ItemStack ore : OreDictionary.getOres(name)) {
tableCasting.addCastingRecipe(
pattern,
@@ -1841,7 +1841,7 @@ public class TinkerSmeltery {
private void registerNuggetCasting(FluidType ft, String name) {
ItemStack pattern = new ItemStack(TinkerSmeltery.metalPattern, 1, 27);
LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting();
LiquidCasting tableCasting = TConstructRegistry.getTableCasting();
for (ItemStack ore : OreDictionary.getOres(name)) {
// don't do oreberries. That'd be silly.
if (ore.getItem() != null && ore.getItem() instanceof OreBerries) {
@@ -500,7 +500,7 @@ public class SmelteryGui extends ActiveContainerGui {
logic.xCoord,
logic.yCoord,
logic.zCoord,
this.isShiftKeyDown(),
isShiftKeyDown(),
fluidToBeBroughtUp));
}
base += fluidHeights[i];
+18 -19
View File
@@ -669,54 +669,53 @@ public class TinkerTools {
}
private void addRecipesForToolBuilder() {
ToolBuilder tb = ToolBuilder.instance;
tb.addNormalToolRecipe(TinkerTools.pickaxe, TinkerTools.pickaxeHead, TinkerTools.toolRod, TinkerTools.binding);
tb.addNormalToolRecipe(
ToolBuilder.addNormalToolRecipe(TinkerTools.pickaxe, TinkerTools.pickaxeHead, TinkerTools.toolRod, TinkerTools.binding);
ToolBuilder.addNormalToolRecipe(
TinkerTools.broadsword, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.wideGuard);
tb.addNormalToolRecipe(TinkerTools.hatchet, TinkerTools.hatchetHead, TinkerTools.toolRod);
tb.addNormalToolRecipe(TinkerTools.shovel, TinkerTools.shovelHead, TinkerTools.toolRod);
tb.addNormalToolRecipe(
ToolBuilder.addNormalToolRecipe(TinkerTools.hatchet, TinkerTools.hatchetHead, TinkerTools.toolRod);
ToolBuilder.addNormalToolRecipe(TinkerTools.shovel, TinkerTools.shovelHead, TinkerTools.toolRod);
ToolBuilder.addNormalToolRecipe(
TinkerTools.longsword, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.handGuard);
tb.addNormalToolRecipe(TinkerTools.rapier, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.crossbar);
tb.addNormalToolRecipe(TinkerTools.frypan, TinkerTools.frypanHead, TinkerTools.toolRod);
tb.addNormalToolRecipe(TinkerTools.battlesign, TinkerTools.signHead, TinkerTools.toolRod);
tb.addNormalToolRecipe(
ToolBuilder.addNormalToolRecipe(TinkerTools.rapier, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.crossbar);
ToolBuilder.addNormalToolRecipe(TinkerTools.frypan, TinkerTools.frypanHead, TinkerTools.toolRod);
ToolBuilder.addNormalToolRecipe(TinkerTools.battlesign, TinkerTools.signHead, TinkerTools.toolRod);
ToolBuilder.addNormalToolRecipe(
TinkerTools.mattock, TinkerTools.hatchetHead, TinkerTools.toolRod, TinkerTools.shovelHead);
tb.addNormalToolRecipe(TinkerTools.dagger, TinkerTools.knifeBlade, TinkerTools.toolRod, TinkerTools.crossbar);
tb.addNormalToolRecipe(TinkerTools.cutlass, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.fullGuard);
tb.addNormalToolRecipe(TinkerTools.chisel, TinkerTools.chiselHead, TinkerTools.toolRod);
ToolBuilder.addNormalToolRecipe(TinkerTools.dagger, TinkerTools.knifeBlade, TinkerTools.toolRod, TinkerTools.crossbar);
ToolBuilder.addNormalToolRecipe(TinkerTools.cutlass, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.fullGuard);
ToolBuilder.addNormalToolRecipe(TinkerTools.chisel, TinkerTools.chiselHead, TinkerTools.toolRod);
tb.addNormalToolRecipe(
ToolBuilder.addNormalToolRecipe(
TinkerTools.scythe,
TinkerTools.scytheBlade,
TinkerTools.toughRod,
TinkerTools.toughBinding,
TinkerTools.toughRod);
tb.addNormalToolRecipe(
ToolBuilder.addNormalToolRecipe(
TinkerTools.lumberaxe,
TinkerTools.broadAxeHead,
TinkerTools.toughRod,
TinkerTools.largePlate,
TinkerTools.toughBinding);
tb.addNormalToolRecipe(
ToolBuilder.addNormalToolRecipe(
TinkerTools.cleaver,
TinkerTools.largeSwordBlade,
TinkerTools.toughRod,
TinkerTools.largePlate,
TinkerTools.toughRod);
tb.addNormalToolRecipe(
ToolBuilder.addNormalToolRecipe(
TinkerTools.excavator,
TinkerTools.excavatorHead,
TinkerTools.toughRod,
TinkerTools.largePlate,
TinkerTools.toughBinding);
tb.addNormalToolRecipe(
ToolBuilder.addNormalToolRecipe(
TinkerTools.hammer,
TinkerTools.hammerHead,
TinkerTools.toughRod,
TinkerTools.largePlate,
TinkerTools.largePlate);
tb.addNormalToolRecipe(
ToolBuilder.addNormalToolRecipe(
TinkerTools.battleaxe,
TinkerTools.broadAxeHead,
TinkerTools.toughRod,
@@ -18,9 +18,9 @@ public class CraftingSlabItemBlock extends MultiItemBlock {
@Override
public String getUnlocalizedName(ItemStack itemstack) {
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, this.blockTypes.length - 1);
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockTypes.length - 1);
if (pos == 0 || pos == 5) {
return this.blockTypes[pos];
return blockTypes[pos];
}
return super.getUnlocalizedName(itemstack);
}
@@ -59,7 +59,7 @@ public class StoneTorch extends MantleBlock {
* Gets if we can place a torch on a block.
*/
private boolean canPlaceTorchOn(World par1World, int par2, int par3, int par4) {
if (par1World.doesBlockHaveSolidTopSurface(par1World, par2, par3, par4)) {
if (World.doesBlockHaveSolidTopSurface(par1World, par2, par3, par4)) {
return true;
} else {
Block b = par1World.getBlock(par2, par3, par4);
@@ -21,11 +21,11 @@ public class CraftedSoilItemBlock extends MultiItemBlock {
@Override
public String getUnlocalizedName(ItemStack itemstack) {
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, this.blockTypes.length - 1);
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockTypes.length - 1);
if (pos <= 4) return super.getUnlocalizedName(itemstack);
return (new StringBuilder())
.append("block.slime.soil.")
.append(this.blockTypes[pos])
.append(blockTypes[pos])
.toString();
}
@@ -18,7 +18,7 @@ public class SlimeTallGrassItem extends MultiItemBlock {
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int meta) {
int arr = MathHelper.clamp_int(meta, 0, this.blockTypes.length);
int arr = MathHelper.clamp_int(meta, 0, blockTypes.length);
return TinkerWorld.slimeTallGrass.getIcon(0, arr);
}
}