From 24937e64cea5f69098ce36f9a7ec37f2804231a6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 6 Jul 2020 21:29:29 -0500 Subject: [PATCH] Fix name clash in TileSimpleInventory --- .../botania/client/model/ModelBrewery.java | 2 +- .../client/render/tile/RenderTileAltar.java | 2 +- .../render/tile/RenderTileRuneAltar.java | 6 +++--- .../render/tile/RenderTileTinyPotato.java | 2 +- .../botania/common/block/tile/TileAltar.java | 19 +++++++------------ .../common/block/tile/TileBrewery.java | 4 ++-- .../common/block/tile/TileCraftCrate.java | 2 +- .../tile/TileExposedSimpleInventory.java | 5 +++++ .../common/block/tile/TileRuneAltar.java | 10 +++++----- .../block/tile/TileSimpleInventory.java | 5 +++-- .../common/block/tile/TileTinyPotato.java | 2 +- .../common/core/helper/InventoryHelper.java | 4 ++-- 12 files changed, 32 insertions(+), 31 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index 02370565a..77fe3cdcf 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -58,7 +58,7 @@ public class ModelBrewery extends Model { public void render(@Nullable TileBrewery brewery, double time, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { float offset = (float) Math.sin(time / 40) * 0.1F + 0.05F; boolean hasTile = brewery != null; - int plates = hasTile ? brewery.getSizeInventory() - 1 : 7; + int plates = hasTile ? brewery.inventorySize() - 1 : 7; float deg = (float) time / 16F; float polerot = -deg * 25F; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 3b410244f..b33420a83 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -55,7 +55,7 @@ public class RenderTileAltar extends TileEntityRenderer { if (water) { int petals = 0; - for (int i = 0; i < altar.getSizeInventory(); i++) { + for (int i = 0; i < altar.inventorySize(); i++) { if (!altar.getItemHandler().getStackInSlot(i).isEmpty()) { petals++; } else { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java index b25bf4a90..3599b2dac 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -41,14 +41,14 @@ public class RenderTileRuneAltar extends TileEntityRenderer { ms.push(); int items = 0; - for (int i = 0; i < altar.getSizeInventory(); i++) { + for (int i = 0; i < altar.inventorySize(); i++) { if (altar.getItemHandler().getStackInSlot(i).isEmpty()) { break; } else { items++; } } - float[] angles = new float[altar.getSizeInventory()]; + float[] angles = new float[altar.inventorySize()]; float anglePer = 360F / items; float totalAngle = 0F; @@ -58,7 +58,7 @@ public class RenderTileRuneAltar extends TileEntityRenderer { double time = ClientTickHandler.ticksInGame + partticks; - for (int i = 0; i < altar.getSizeInventory(); i++) { + for (int i = 0; i < altar.inventorySize(); i++) { ms.push(); ms.translate(0.5F, 1.25F, 0.5F); ms.rotate(Vector3f.YP.rotationDegrees(angles[i] + (float) time)); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 3fbe90d61..c388f2b90 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -229,7 +229,7 @@ public class RenderTileTinyPotato extends TileEntityRenderer { float s = 1F / 3.5F; ms.scale(s, s, s); - for (int i = 0; i < potato.getSizeInventory(); i++) { + for (int i = 0; i < potato.inventorySize(); i++) { ItemStack stack = potato.getItemHandler().getStackInSlot(i); if (stack.isEmpty()) { continue; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index 0d143e3ff..2bf1c78ef 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -8,18 +8,15 @@ */ package vazkii.botania.common.block.tile; -import com.google.common.base.Preconditions; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Inventory; @@ -30,11 +27,9 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.particles.ParticleTypes; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.registry.Registry; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fluids.FluidAttributes; @@ -142,7 +137,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, saveLastRecipe(); ItemStack output = recipe.getCraftingResult(getItemHandler()); - for (int i = 0; i < getSizeInventory(); i++) { + for (int i = 0; i < inventorySize(); i++) { getItemHandler().setInventorySlotContents(i, ItemStack.EMPTY); } @@ -158,11 +153,11 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, }); return maybeRecipe.isPresent(); } else if (!hasFluidCapability && !item.getTags().contains(ITEM_TAG_APOTHECARY_SPAWNED)) { - if (!getItemHandler().getStackInSlot(getSizeInventory() - 1).isEmpty()) { + if (!getItemHandler().getStackInSlot(inventorySize() - 1).isEmpty()) { return false; } - for (int i = 0; i < getSizeInventory(); i++) { + for (int i = 0; i < inventorySize(); i++) { if (getItemHandler().getStackInSlot(i).isEmpty()) { getItemHandler().setInventorySlotContents(i, stack.split(1)); world.playSound(null, pos, SoundEvents.ENTITY_GENERIC_SPLASH, SoundCategory.BLOCKS, 0.1F, 10F); @@ -185,7 +180,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, public void saveLastRecipe() { lastRecipe = new ArrayList<>(); - for (int i = 0; i < getSizeInventory(); i++) { + for (int i = 0; i < inventorySize(); i++) { ItemStack stack = getItemHandler().getStackInSlot(i); if (stack.isEmpty()) { break; @@ -234,7 +229,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, } public boolean isEmpty() { - for (int i = 0; i < getSizeInventory(); i++) { + for (int i = 0; i < inventorySize(); i++) { if (!getItemHandler().getStackInSlot(i).isEmpty()) { return false; } @@ -257,7 +252,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } } else { - for (int i = 0; i < getSizeInventory(); i++) { + for (int i = 0; i < inventorySize(); i++) { ItemStack stackAt = getItemHandler().getStackInSlot(i); if (stackAt.isEmpty()) { break; @@ -345,7 +340,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, float angle = -90; int radius = 24; int amt = 0; - for (int i = 0; i < getSizeInventory(); i++) { + for (int i = 0; i < inventorySize(); i++) { if (getItemHandler().getStackInSlot(i).isEmpty()) { break; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index f18842fcc..9134f2b8d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -61,7 +61,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver, I boolean did = false; - for (int i = 0; i < getSizeInventory(); i++) { + for (int i = 0; i < inventorySize(); i++) { if (getItemHandler().getStackInSlot(i).isEmpty()) { did = true; ItemStack stackToAdd = stack.copy(); @@ -149,7 +149,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver, I world.addEntity(outputItem); world.addBlockEvent(getPos(), ModBlocks.brewery, CRAFT_EFFECT_EVENT, recipe.getBrew().getColor(output)); - for (int i = 0; i < getSizeInventory(); i++) { + for (int i = 0; i < inventorySize(); i++) { getItemHandler().setInventorySlotContents(i, ItemStack.EMPTY); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 5fff12f20..3520851e5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -138,7 +138,7 @@ public class TileCraftCrate extends TileOpenCrate { } private void ejectAll() { - for (int i = 0; i < getSizeInventory(); ++i) { + for (int i = 0; i < inventorySize(); ++i) { ItemStack stack = getItemHandler().getStackInSlot(i); if (!stack.isEmpty()) { eject(stack, false); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileExposedSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileExposedSimpleInventory.java index 0ff7e7f30..ab3dd3e22 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileExposedSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileExposedSimpleInventory.java @@ -26,6 +26,11 @@ public abstract class TileExposedSimpleInventory extends TileSimpleInventory imp return getItemHandler().isEmpty(); } + @Override + public int getSizeInventory() { + return inventorySize(); + } + @Override public ItemStack getStackInSlot(int index) { return getItemHandler().getStackInSlot(index); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index f8428e285..d0308a050 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -93,7 +93,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver, boolean did = false; - for (int i = 0; i < getSizeInventory(); i++) { + for (int i = 0; i < inventorySize(); i++) { if (getItemHandler().getStackInSlot(i).isEmpty()) { did = true; ItemStack stackToAdd = stack.copy(); @@ -221,7 +221,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver, private void saveLastRecipe() { lastRecipe = new ArrayList<>(); - for (int i = 0; i < getSizeInventory(); i++) { + for (int i = 0; i < inventorySize(); i++) { ItemStack stack = getItemHandler().getStackInSlot(i); if (stack.isEmpty()) { break; @@ -276,7 +276,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver, world.addBlockEvent(getPos(), ModBlocks.runeAltar, CRAFT_EFFECT_EVENT, 0); saveLastRecipe(); - for (int i = 0; i < getSizeInventory(); i++) { + for (int i = 0; i < inventorySize(); i++) { ItemStack stack = getItemHandler().getStackInSlot(i); if (!stack.isEmpty()) { if (stack.getItem() instanceof ItemRune && (player == null || !player.abilities.isCreativeMode)) { @@ -294,7 +294,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver, } public boolean isEmpty() { - for (int i = 0; i < getSizeInventory(); i++) { + for (int i = 0; i < inventorySize(); i++) { if (!getItemHandler().getStackInSlot(i).isEmpty()) { return false; } @@ -362,7 +362,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver, float angle = -90; int radius = 24; int amt = 0; - for (int i = 0; i < getSizeInventory(); i++) { + for (int i = 0; i < inventorySize(); i++) { if (getItemHandler().getStackInSlot(i).isEmpty()) { break; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index 0103fcf7a..13d118704 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -44,7 +44,7 @@ public abstract class TileSimpleInventory extends TileMod { @Override public void readPacketNBT(CompoundNBT tag) { - NonNullList tmp = NonNullList.withSize(getSizeInventory(), ItemStack.EMPTY); + NonNullList tmp = NonNullList.withSize(inventorySize(), ItemStack.EMPTY); ItemStackHelper.loadAllItems(tag, tmp); copyToInv(tmp, itemHandler); } @@ -54,7 +54,8 @@ public abstract class TileSimpleInventory extends TileMod { ItemStackHelper.saveAllItems(tag, copyFromInv(itemHandler)); } - public final int getSizeInventory() { + // NB: Cannot be named the same as the corresponding method in vanilla's interface -- causes obf issues with MCP + public final int inventorySize() { return getItemHandler().getSizeInventory(); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index 80d9dda11..19c2c6c81 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -68,7 +68,7 @@ public class TileTinyPotato extends TileExposedSimpleInventory implements ITicka world.playSound(null, pos, ModSounds.doit, SoundCategory.BLOCKS, 1F, 1F); } - for (int i = 0; i < getSizeInventory(); i++) { + for (int i = 0; i < inventorySize(); i++) { ItemStack stackAt = getItemHandler().getStackInSlot(i); if (!stackAt.isEmpty() && stackAt.getItem() == ModBlocks.tinyPotato.asItem()) { player.sendMessage(new StringTextComponent("Don't talk to me or my son ever again."), Util.field_240973_b_); diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index 3cf27c62d..60d34ce62 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -49,7 +49,7 @@ public class InventoryHelper { public static void dropInventory(TileSimpleInventory inv, World world, BlockState state, BlockPos pos) { if (inv != null) { - for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { + for (int j1 = 0; j1 < inv.inventorySize(); ++j1) { ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); if (!itemstack.isEmpty()) { @@ -62,7 +62,7 @@ public class InventoryHelper { } public static void withdrawFromInventory(TileSimpleInventory inv, PlayerEntity player) { - for (int i = inv.getSizeInventory() - 1; i >= 0; i--) { + for (int i = inv.inventorySize() - 1; i >= 0; i--) { ItemStack stackAt = inv.getItemHandler().getStackInSlot(i); if (!stackAt.isEmpty()) { ItemStack copy = stackAt.copy();