Cleanup, black hole talisman uses caps, debug handler shows extended state

This commit is contained in:
Vincent Lee committed 2016-07-30 16:24:42 -05:00
1 parent 21a35c9c92
commit 5041e23ede
3 files changed
+40 -46

No files matched your search

@@ -10,12 +10,17 @@
*/
package vazkii.botania.client.core.handler;
import com.google.common.base.Optional;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.Entity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.lwjgl.opengl.ARBFragmentShader;
import org.lwjgl.opengl.ContextCapabilities;
@@ -27,6 +32,7 @@ import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.handler.ManaNetworkHandler;
import vazkii.botania.common.lib.LibMisc;
import java.util.Map;
import java.util.UUID;
public final class DebugHandler {
@@ -39,7 +45,7 @@ public final class DebugHandler {
public static void onDrawDebugText(RenderGameOverlayEvent.Text event) {
World world = Minecraft.getMinecraft().theWorld;
if(Minecraft.getMinecraft().gameSettings.showDebugInfo) {
event.getLeft().add(null);
event.getLeft().add("");
String version = LibMisc.VERSION;
if(version.contains("GRADLE"))
version = "N/A";
@@ -70,6 +76,19 @@ public final class DebugHandler {
event.getLeft().add(" GL_ARB_multitexture: " + caps.GL_ARB_multitexture);
event.getLeft().add(" GL_ARB_texture_non_power_of_two: " + caps.GL_ARB_texture_non_power_of_two);
event.getLeft().add(" OpenGL13: " + caps.OpenGL13);
if (Minecraft.getMinecraft().objectMouseOver != null
&& Minecraft.getMinecraft().objectMouseOver.getBlockPos() != null) {
BlockPos pos = Minecraft.getMinecraft().objectMouseOver.getBlockPos();
IBlockState state = world.getBlockState(pos);
state = state.getActualState(world, pos);
state = state.getBlock().getExtendedState(state, world, pos);
if (state instanceof IExtendedBlockState) {
for (Map.Entry<IUnlistedProperty<?>, Optional<?>> e : ((IExtendedBlockState) state).getUnlistedProperties().entrySet()) {
event.getRight().add(e.getKey().getName() + ": " + e.getValue().orNull());
}
}
}
} else if(Minecraft.IS_RUNNING_ON_MAC)
event.getLeft().add(PREFIX + "SHIFT+CMD for context");
else event.getLeft().add(PREFIX + "SHIFT+CTRL for context");
@@ -43,17 +43,8 @@ import java.util.Spliterators;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
// Some methods from OpenBlocksLib: https://github.com/OpenMods/OpenModsLib
public class InventoryHelper {
public static int[] buildSlotsForLinearInventory(IInventory inv) {
int[] slots = new int[inv.getSizeInventory()];
for (int i = 0; i < slots.length; i++)
slots[i] = i;
return slots;
}
public static InvWithLocation getInventoryWithLocation(World world, BlockPos pos, EnumFacing side) {
IItemHandler ret = getInventory(world, pos, side);
if(ret == null)
@@ -35,6 +35,9 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper;
import net.minecraftforge.oredict.RecipeSorter;
import net.minecraftforge.oredict.RecipeSorter.Category;
import vazkii.botania.api.item.IBlockProvider;
@@ -79,59 +82,41 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider {
@Nonnull
@Override
public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) {
public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
IBlockState state = world.getBlockState(pos);
boolean set = setBlock(par1ItemStack, state.getBlock(), state.getBlock().getMetaFromState(state));
boolean set = setBlock(stack, state.getBlock(), state.getBlock().getMetaFromState(state));
if(!set) {
Block bBlock = getBlock(par1ItemStack);
int bmeta = getBlockMeta(par1ItemStack);
Block bBlock = getBlock(stack);
int bmeta = getBlockMeta(stack);
TileEntity tile = world.getTileEntity(pos);
if(tile != null && tile instanceof IInventory) {
IInventory inv = (IInventory) tile;
int[] slots = inv instanceof ISidedInventory ? ((ISidedInventory) inv).getSlotsForFace(side) : InventoryHelper.buildSlotsForLinearInventory(inv);
for(int slot : slots) {
ItemStack stackInSlot = inv.getStackInSlot(slot);
if(stackInSlot == null) {
ItemStack stack = new ItemStack(bBlock, 1, bmeta);
int maxSize = stack.getMaxStackSize();
stack.stackSize = remove(par1ItemStack, maxSize);
if(stack.stackSize != 0) {
if(inv.isItemValidForSlot(slot, stack) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, stack, side))) {
inv.setInventorySlotContents(slot, stack);
inv.markDirty();
set = true;
}
}
} else if(stackInSlot.getItem() == Item.getItemFromBlock(bBlock) && stackInSlot.getItemDamage() == bmeta) {
int maxSize = stackInSlot.getMaxStackSize();
int missing = maxSize - stackInSlot.stackSize;
if(inv.isItemValidForSlot(slot, stackInSlot) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, stackInSlot, side))) {
stackInSlot.stackSize += remove(par1ItemStack, missing);
inv.markDirty();
set = true;
}
}
}
if(tile != null && tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side)) {
IItemHandler inv = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side);
ItemStack toAdd = new ItemStack(bBlock, 1, bmeta);
int maxSize = toAdd.getMaxStackSize();
toAdd.stackSize = remove(stack, maxSize);
ItemStack remainder = ItemHandlerHelper.insertItemStacked(inv, toAdd, false);
if(remainder != null)
add(stack, remainder.stackSize);
} else {
int entities = world.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(pos.offset(side), pos.offset(side).add(1, 1, 1))).size();
BlockPos correctedPos = bBlock.isReplaceable(world, pos) ? pos : pos.offset(side);
if(entities == 0 && !(correctedPos.getY() < 0) && !(correctedPos.getY() >= 256)) {
int remove = player.capabilities.isCreativeMode ? 1 : remove(par1ItemStack, 1);
int remove = player.capabilities.isCreativeMode ? 1 : remove(stack, 1);
if(remove > 0) {
ItemStack stack = new ItemStack(bBlock, 1, bmeta);
ItemsRemainingRenderHandler.set(stack, getBlockCount(par1ItemStack));
ItemStack toUse = new ItemStack(bBlock, 1, bmeta);
ItemsRemainingRenderHandler.set(toUse, getBlockCount(stack));
Item.getItemFromBlock(bBlock).onItemUse(stack, player, world, pos, hand, side, par8, par9, par10);
Item.getItemFromBlock(bBlock).onItemUse(toUse, player, world, pos, hand, side, hitX, hitY, hitZ);
set = true;
}
}
}
}
player.setItemStackToSlot(hand == EnumHand.MAIN_HAND ? EntityEquipmentSlot.MAINHAND : EntityEquipmentSlot.OFFHAND, par1ItemStack);
player.setItemStackToSlot(hand == EnumHand.MAIN_HAND ? EntityEquipmentSlot.MAINHAND : EntityEquipmentSlot.OFFHAND, stack);
return set ? EnumActionResult.SUCCESS : EnumActionResult.PASS;
}
@@ -144,7 +129,6 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider {
int highest = -1;
int[] counts = new int[player.inventory.getSizeInventory() - player.inventory.armorInventory.length];
Arrays.fill(counts, 0);
for(int i = 0; i < counts.length; i++) {
ItemStack stack = player.inventory.getStackInSlot(i);