Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2b4093099f | ||
|
|
6f6360ae11 | ||
|
|
cb006c4983 | ||
|
|
bf258580d4 | ||
|
|
efa47851be | ||
|
|
d01fe52aba |
@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
|
|||||||
//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
|
//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
|
||||||
|
|
||||||
|
|
||||||
version = "0.1.1"
|
version = "0.1.3"
|
||||||
group = "nl.requios.effortlessbuilding" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
|
group = "nl.requios.effortlessbuilding" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
|
||||||
archivesBaseName = "effortlessbuilding"
|
archivesBaseName = "effortlessbuilding"
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,17 @@
|
|||||||
package nl.requios.effortlessbuilding;
|
package nl.requios.effortlessbuilding;
|
||||||
|
|
||||||
|
import net.minecraft.block.Block;
|
||||||
|
import net.minecraft.block.state.IBlockState;
|
||||||
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.util.EnumFacing;
|
||||||
import net.minecraft.util.EnumHand;
|
import net.minecraft.util.EnumHand;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.util.math.Vec3i;
|
import net.minecraft.util.math.Vec3i;
|
||||||
import net.minecraftforge.common.util.BlockSnapshot;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.event.world.BlockEvent;
|
import net.minecraftforge.event.world.BlockEvent;
|
||||||
|
import net.minecraftforge.items.IItemHandler;
|
||||||
|
import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
|
||||||
|
|
||||||
public class Array {
|
public class Array {
|
||||||
//TODO config file
|
//TODO config file
|
||||||
@@ -37,17 +44,46 @@ public class Array {
|
|||||||
|
|
||||||
BlockPos pos = event.getPos();
|
BlockPos pos = event.getPos();
|
||||||
Vec3i offset = new Vec3i(a.offset.getX(), a.offset.getY(), a.offset.getZ());
|
Vec3i offset = new Vec3i(a.offset.getX(), a.offset.getY(), a.offset.getZ());
|
||||||
|
|
||||||
|
//Randomizer bag synergy
|
||||||
|
IItemHandler bagInventory = null;
|
||||||
|
if (event.getPlayer().getHeldItemMainhand().getItem() instanceof ItemRandomizerBag) {
|
||||||
|
bagInventory = ItemRandomizerBag.getBagInventory(event.getPlayer().getHeldItemMainhand());
|
||||||
|
}
|
||||||
|
|
||||||
|
//Get itemstack
|
||||||
|
ItemStack itemStack = event.getPlayer().getHeldItem(event.getHand());
|
||||||
|
|
||||||
for (int i = 0; i < a.count; i++) {
|
for (int i = 0; i < a.count; i++) {
|
||||||
pos = pos.add(offset);
|
pos = pos.add(offset);
|
||||||
if (event.getWorld().isBlockLoaded(pos, true)) {
|
if (event.getWorld().isBlockLoaded(pos, true)) {
|
||||||
event.getWorld().setBlockState(pos, event.getPlacedBlock());
|
if (itemStack.isEmpty()) break;
|
||||||
|
|
||||||
//Mirror synergy
|
//Check if held block = placed block (otherwise its a bag or wand)
|
||||||
BlockSnapshot blockSnapshot = new BlockSnapshot(event.getWorld(), pos, event.getPlacedBlock());
|
if (!event.getPlayer().isCreative() && Block.getBlockFromItem(itemStack.getItem()) == event.getPlacedBlock().getBlock()) {
|
||||||
BlockEvent.PlaceEvent placeEvent = new BlockEvent.PlaceEvent(blockSnapshot, event.getPlacedBlock(), event.getPlayer(), EnumHand.MAIN_HAND);
|
itemStack.shrink(1);
|
||||||
Mirror.onBlockPlaced(placeEvent);
|
}
|
||||||
|
|
||||||
|
//Randomizer bag synergy
|
||||||
|
IBlockState blockState = bagInventory == null ? event.getPlacedBlock() :
|
||||||
|
getBlockStateFromRandomizerBag(bagInventory, event.getWorld(), event.getPlayer(), event.getPos());
|
||||||
|
|
||||||
|
//TODO check if can place (ItemBlock) and if can break replaced
|
||||||
|
|
||||||
|
//Drop existing block
|
||||||
|
SurvivalHelper.dropBlock(event.getWorld(), pos, event.getPlayer());
|
||||||
|
|
||||||
|
event.getWorld().setBlockState(pos, blockState);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//EffortlessBuilding.log(event.getPlayer(), String.valueOf(event.getPlayer().getHeldItem(event.getHand()).getCount()));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static IBlockState getBlockStateFromRandomizerBag(IItemHandler bagInventory, World world, EntityPlayer player, BlockPos pos) {
|
||||||
|
int randomSlot = ItemRandomizerBag.pickRandomSlot(bagInventory);
|
||||||
|
ItemStack stack = bagInventory.getStackInSlot(randomSlot);
|
||||||
|
//TODO get facing from getPlacedAgainst and getPlacedBlock
|
||||||
|
return Block.getBlockFromItem(stack.getItem()).getStateForPlacement(world, pos, EnumFacing.NORTH, 0, 0, 0, stack.getMetadata(), player, EnumHand.MAIN_HAND);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Called from EventHandler
|
//Called from EventHandler
|
||||||
@@ -65,18 +101,13 @@ public class Array {
|
|||||||
for (int i = 0; i < a.count; i++) {
|
for (int i = 0; i < a.count; i++) {
|
||||||
pos = pos.add(offset);
|
pos = pos.add(offset);
|
||||||
if (event.getWorld().isBlockLoaded(pos, false)) {
|
if (event.getWorld().isBlockLoaded(pos, false)) {
|
||||||
event.getWorld().setBlockToAir(pos);
|
//TODO check if can break
|
||||||
|
|
||||||
//Mirror synergy
|
//Drop existing block
|
||||||
BlockEvent.BreakEvent breakEvent = new BlockEvent.BreakEvent(event.getWorld(), pos, event.getState(), event.getPlayer());
|
SurvivalHelper.dropBlock(event.getWorld(), pos, event.getPlayer());
|
||||||
Mirror.onBlockBroken(breakEvent);
|
|
||||||
|
event.getWorld().setBlockToAir(pos);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// @SubscribeEvent
|
|
||||||
// @SideOnly(Side.CLIENT)
|
|
||||||
// public static void onRender(RenderWorldLastEvent event) {
|
|
||||||
//
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import net.minecraftforge.fml.common.network.NetworkRegistry;
|
|||||||
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
|
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import nl.requios.effortlessbuilding.capability.*;
|
import nl.requios.effortlessbuilding.capability.*;
|
||||||
import nl.requios.effortlessbuilding.inventory.RandomizerGuiHandler;
|
import nl.requios.effortlessbuilding.gui.RandomizerBagGuiHandler;
|
||||||
import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
|
import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
|
||||||
import nl.requios.effortlessbuilding.network.BuildSettingsMessage;
|
import nl.requios.effortlessbuilding.network.BuildSettingsMessage;
|
||||||
import nl.requios.effortlessbuilding.network.QuickReplaceMessage;
|
import nl.requios.effortlessbuilding.network.QuickReplaceMessage;
|
||||||
@@ -29,7 +29,7 @@ public class EffortlessBuilding
|
|||||||
{
|
{
|
||||||
public static final String MODID = "effortlessbuilding";
|
public static final String MODID = "effortlessbuilding";
|
||||||
public static final String NAME = "Effortless Building";
|
public static final String NAME = "Effortless Building";
|
||||||
public static final String VERSION = "0.1.2";
|
public static final String VERSION = "0.1.3";
|
||||||
|
|
||||||
@Mod.Instance(EffortlessBuilding.MODID)
|
@Mod.Instance(EffortlessBuilding.MODID)
|
||||||
public static EffortlessBuilding instance;
|
public static EffortlessBuilding instance;
|
||||||
@@ -44,11 +44,13 @@ public class EffortlessBuilding
|
|||||||
|
|
||||||
public static final SimpleNetworkWrapper packetHandler = NetworkRegistry.INSTANCE.newSimpleChannel(EffortlessBuilding.MODID);
|
public static final SimpleNetworkWrapper packetHandler = NetworkRegistry.INSTANCE.newSimpleChannel(EffortlessBuilding.MODID);
|
||||||
|
|
||||||
|
public static final ItemRandomizerBag ITEM_RANDOMIZER_BAG = new ItemRandomizerBag();
|
||||||
|
|
||||||
public static final Block[] BLOCKS = {
|
public static final Block[] BLOCKS = {
|
||||||
};
|
};
|
||||||
|
|
||||||
public static final Item[] ITEMS = {
|
public static final Item[] ITEMS = {
|
||||||
new ItemRandomizerBag()
|
ITEM_RANDOMIZER_BAG
|
||||||
};
|
};
|
||||||
|
|
||||||
public static final int RANDOMIZER_BAG_GUI = 0;
|
public static final int RANDOMIZER_BAG_GUI = 0;
|
||||||
@@ -75,7 +77,7 @@ public class EffortlessBuilding
|
|||||||
// Register network handlers
|
// Register network handlers
|
||||||
public void init(FMLInitializationEvent event)
|
public void init(FMLInitializationEvent event)
|
||||||
{
|
{
|
||||||
NetworkRegistry.INSTANCE.registerGuiHandler(EffortlessBuilding.instance, new RandomizerGuiHandler());
|
NetworkRegistry.INSTANCE.registerGuiHandler(EffortlessBuilding.instance, new RandomizerBagGuiHandler());
|
||||||
proxy.init(event);
|
proxy.init(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ import net.minecraft.entity.Entity;
|
|||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemBlock;
|
import net.minecraft.item.ItemBlock;
|
||||||
|
import net.minecraft.item.crafting.IRecipe;
|
||||||
|
import net.minecraft.util.EnumHand;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraftforge.event.AttachCapabilitiesEvent;
|
import net.minecraftforge.event.AttachCapabilitiesEvent;
|
||||||
import net.minecraftforge.event.RegistryEvent;
|
import net.minecraftforge.event.RegistryEvent;
|
||||||
@@ -45,15 +47,15 @@ public class EventHandler
|
|||||||
public static void onBlockPlaced(BlockEvent.PlaceEvent event) {
|
public static void onBlockPlaced(BlockEvent.PlaceEvent event) {
|
||||||
QuickReplace.onBlockPlaced(event);
|
QuickReplace.onBlockPlaced(event);
|
||||||
if (event.isCanceled()) return;
|
if (event.isCanceled()) return;
|
||||||
Array.onBlockPlaced(event);
|
|
||||||
Mirror.onBlockPlaced(event);
|
Mirror.onBlockPlaced(event);
|
||||||
|
Array.onBlockPlaced(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void onBlockBroken(BlockEvent.BreakEvent event) {
|
public static void onBlockBroken(BlockEvent.BreakEvent event) {
|
||||||
Array.onBlockBroken(event);
|
|
||||||
Mirror.onBlockBroken(event);
|
Mirror.onBlockBroken(event);
|
||||||
|
Array.onBlockBroken(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,24 +1,27 @@
|
|||||||
package nl.requios.effortlessbuilding;
|
package nl.requios.effortlessbuilding;
|
||||||
|
|
||||||
import net.minecraft.block.BlockDirectional;
|
import net.minecraft.block.*;
|
||||||
import net.minecraft.block.BlockDispenser;
|
|
||||||
import net.minecraft.block.BlockStairs;
|
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.entity.EntityPlayerSP;
|
|
||||||
import net.minecraft.client.renderer.BufferBuilder;
|
import net.minecraft.client.renderer.BufferBuilder;
|
||||||
import net.minecraft.client.renderer.Tessellator;
|
import net.minecraft.client.renderer.Tessellator;
|
||||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||||
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.EnumFacing;
|
import net.minecraft.util.EnumFacing;
|
||||||
|
import net.minecraft.util.EnumHand;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.util.math.Vec3d;
|
import net.minecraft.util.math.Vec3d;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.client.event.RenderWorldLastEvent;
|
import net.minecraftforge.client.event.RenderWorldLastEvent;
|
||||||
|
import net.minecraftforge.common.util.BlockSnapshot;
|
||||||
import net.minecraftforge.event.world.BlockEvent;
|
import net.minecraftforge.event.world.BlockEvent;
|
||||||
import net.minecraftforge.fml.common.Mod;
|
import net.minecraftforge.fml.common.Mod;
|
||||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
import net.minecraftforge.items.IItemHandler;
|
||||||
|
import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
import org.lwjgl.util.Color;
|
import org.lwjgl.util.Color;
|
||||||
|
|
||||||
@@ -73,64 +76,108 @@ public class Mirror {
|
|||||||
|
|
||||||
if (oldBlockPos.getX() + 0.5 < m.position.x - m.radius || oldBlockPos.getX() + 0.5 > m.position.x + m.radius ||
|
if (oldBlockPos.getX() + 0.5 < m.position.x - m.radius || oldBlockPos.getX() + 0.5 > m.position.x + m.radius ||
|
||||||
oldBlockPos.getY() + 0.5 < m.position.y - m.radius || oldBlockPos.getY() + 0.5 > m.position.y + m.radius ||
|
oldBlockPos.getY() + 0.5 < m.position.y - m.radius || oldBlockPos.getY() + 0.5 > m.position.y + m.radius ||
|
||||||
oldBlockPos.getZ() + 0.5 < m.position.z - m.radius || oldBlockPos.getZ() + 0.5 > m.position.z+ m.radius)
|
oldBlockPos.getZ() + 0.5 < m.position.z - m.radius || oldBlockPos.getZ() + 0.5 > m.position.z + m.radius)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
//Randomizer bag synergy
|
||||||
|
IItemHandler bagInventory = null;
|
||||||
|
if (event.getPlayer().getHeldItem(event.getHand()).getItem() == EffortlessBuilding.ITEM_RANDOMIZER_BAG) {
|
||||||
|
bagInventory = ItemRandomizerBag.getBagInventory(event.getPlayer().getHeldItem(EnumHand.MAIN_HAND));
|
||||||
|
}
|
||||||
|
|
||||||
if (m.mirrorX) {
|
if (m.mirrorX) {
|
||||||
placeMirrorX(event.getWorld(), m, oldBlockPos, event.getPlacedBlock());
|
placeMirrorX(event.getWorld(), event.getPlayer(), m, event.getPos(), event.getPlacedBlock(), bagInventory);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m.mirrorY) {
|
if (m.mirrorY) {
|
||||||
placeMirrorY(event.getWorld(), m, oldBlockPos, event.getPlacedBlock());
|
placeMirrorY(event.getWorld(), event.getPlayer(), m, oldBlockPos, event.getPlacedBlock(), bagInventory);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m.mirrorZ) {
|
if (m.mirrorZ) {
|
||||||
placeMirrorZ(event.getWorld(), m, oldBlockPos, event.getPlacedBlock());
|
placeMirrorZ(event.getWorld(), event.getPlayer(), m, oldBlockPos, event.getPlacedBlock(), bagInventory);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void placeMirrorX(World world, MirrorSettings m, BlockPos oldBlockPos, IBlockState oldBlockState) {
|
private static IBlockState getBlockStateFromRandomizerBag(IItemHandler bagInventory, World world, EntityPlayer player, BlockPos pos) {
|
||||||
|
int randomSlot = ItemRandomizerBag.pickRandomSlot(bagInventory);
|
||||||
|
ItemStack stack = bagInventory.getStackInSlot(randomSlot);
|
||||||
|
//TODO get facing from getPlacedAgainst and getPlacedBlock
|
||||||
|
return Block.getBlockFromItem(stack.getItem()).getStateForPlacement(world, pos, EnumFacing.NORTH, 0, 0, 0, stack.getMetadata(), player, EnumHand.MAIN_HAND);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void placeMirrorX(World world, EntityPlayer player, MirrorSettings m, BlockPos oldBlockPos, IBlockState oldBlockState, IItemHandler bagInventory) {
|
||||||
//find mirror position
|
//find mirror position
|
||||||
double x = m.position.x + (m.position.x - oldBlockPos.getX() - 0.5);
|
double x = m.position.x + (m.position.x - oldBlockPos.getX() - 0.5);
|
||||||
BlockPos newBlockPos = new BlockPos(x, oldBlockPos.getY(), oldBlockPos.getZ());
|
BlockPos newBlockPos = new BlockPos(x, oldBlockPos.getY(), oldBlockPos.getZ());
|
||||||
IBlockState newBlockState = oldBlockState;
|
|
||||||
|
//Randomizer bag synergy
|
||||||
|
if (bagInventory != null)
|
||||||
|
oldBlockState = getBlockStateFromRandomizerBag(bagInventory, world, player, oldBlockPos);
|
||||||
|
|
||||||
|
IBlockState newBlockState = oldBlockState.withMirror(net.minecraft.util.Mirror.FRONT_BACK);
|
||||||
//place block
|
//place block
|
||||||
if (world.isBlockLoaded(newBlockPos, true)) {
|
if (world.isBlockLoaded(newBlockPos, true)) {
|
||||||
newBlockState = oldBlockState.withMirror(net.minecraft.util.Mirror.FRONT_BACK);
|
placeBlock(world, player, newBlockPos, newBlockState);
|
||||||
|
|
||||||
world.setBlockState(newBlockPos, newBlockState);
|
|
||||||
}
|
}
|
||||||
if (m.mirrorY) placeMirrorY(world, m, newBlockPos, newBlockState);
|
if (m.mirrorY) placeMirrorY(world, player, m, newBlockPos, newBlockState, bagInventory);
|
||||||
if (m.mirrorZ) placeMirrorZ(world, m, newBlockPos, newBlockState);
|
if (m.mirrorZ) placeMirrorZ(world, player, m, newBlockPos, newBlockState, bagInventory);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void placeMirrorY(World world, MirrorSettings m, BlockPos oldBlockPos, IBlockState oldBlockState) {
|
private static void placeMirrorY(World world, EntityPlayer player, MirrorSettings m, BlockPos oldBlockPos, IBlockState oldBlockState, IItemHandler bagInventory) {
|
||||||
//find mirror position
|
//find mirror position
|
||||||
double y = m.position.y + (m.position.y - oldBlockPos.getY() - 0.5);
|
double y = m.position.y + (m.position.y - oldBlockPos.getY() - 0.5);
|
||||||
BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), y, oldBlockPos.getZ());
|
BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), y, oldBlockPos.getZ());
|
||||||
IBlockState newBlockState = oldBlockState;
|
|
||||||
|
//Randomizer bag synergy
|
||||||
|
if (bagInventory != null)
|
||||||
|
oldBlockState = getBlockStateFromRandomizerBag(bagInventory, world, player, oldBlockPos);
|
||||||
|
|
||||||
|
IBlockState newBlockState = getVerticalMirror(oldBlockState);
|
||||||
//place block
|
//place block
|
||||||
if (world.isBlockLoaded(newBlockPos, true)) {
|
if (world.isBlockLoaded(newBlockPos, true)) {
|
||||||
newBlockState = getVerticalMirror(oldBlockState);
|
placeBlock(world, player, newBlockPos, newBlockState);
|
||||||
|
|
||||||
world.setBlockState(newBlockPos, newBlockState);
|
|
||||||
}
|
}
|
||||||
if (m.mirrorZ) placeMirrorZ(world, m, newBlockPos, newBlockState);
|
if (m.mirrorZ) placeMirrorZ(world, player, m, newBlockPos, newBlockState, bagInventory);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void placeMirrorZ(World world, MirrorSettings m, BlockPos oldBlockPos, IBlockState oldBlockState) {
|
private static void placeMirrorZ(World world, EntityPlayer player, MirrorSettings m, BlockPos oldBlockPos, IBlockState oldBlockState, IItemHandler bagInventory) {
|
||||||
//find mirror position
|
//find mirror position
|
||||||
double z = m.position.z + (m.position.z - oldBlockPos.getZ() - 0.5);
|
double z = m.position.z + (m.position.z - oldBlockPos.getZ() - 0.5);
|
||||||
BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), oldBlockPos.getY(), z);
|
BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), oldBlockPos.getY(), z);
|
||||||
IBlockState newBlockState = oldBlockState;
|
|
||||||
|
//Randomizer bag synergy
|
||||||
|
if (bagInventory != null)
|
||||||
|
oldBlockState = getBlockStateFromRandomizerBag(bagInventory, world, player, oldBlockPos);
|
||||||
|
|
||||||
|
IBlockState newBlockState = oldBlockState.withMirror(net.minecraft.util.Mirror.LEFT_RIGHT);
|
||||||
//place block
|
//place block
|
||||||
if (world.isBlockLoaded(newBlockPos, true)) {
|
if (world.isBlockLoaded(newBlockPos, true)) {
|
||||||
newBlockState = oldBlockState.withMirror(net.minecraft.util.Mirror.LEFT_RIGHT);
|
placeBlock(world, player, newBlockPos, newBlockState);
|
||||||
|
|
||||||
world.setBlockState(newBlockPos, newBlockState);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void placeBlock(World world, EntityPlayer player, BlockPos newBlockPos, IBlockState newBlockState) {
|
||||||
|
//Check itemstack
|
||||||
|
ItemStack itemStack = player.getHeldItem(player.swingingHand); //TODO check hand
|
||||||
|
if (itemStack.isEmpty()) return;
|
||||||
|
|
||||||
|
//TODO check if can place
|
||||||
|
//TODO check if can break
|
||||||
|
|
||||||
|
SurvivalHelper.dropBlock(world, newBlockPos, player);
|
||||||
|
world.setBlockState(newBlockPos, newBlockState);
|
||||||
|
|
||||||
|
//Check if held block = placed block (otherwise its a bag or wand)
|
||||||
|
if (!player.isCreative() && Block.getBlockFromItem(itemStack.getItem()) == newBlockState.getBlock()) {
|
||||||
|
itemStack.shrink(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
//Array synergy
|
||||||
|
BlockSnapshot blockSnapshot = new BlockSnapshot(world, newBlockPos, newBlockState);
|
||||||
|
BlockEvent.PlaceEvent placeEvent = new BlockEvent.PlaceEvent(blockSnapshot, newBlockState, player, EnumHand.MAIN_HAND);
|
||||||
|
Array.onBlockPlaced(placeEvent);
|
||||||
|
}
|
||||||
|
|
||||||
private static IBlockState getVerticalMirror(IBlockState blockState) {
|
private static IBlockState getVerticalMirror(IBlockState blockState) {
|
||||||
//Stairs
|
//Stairs
|
||||||
if (blockState.getBlock() instanceof BlockStairs) {
|
if (blockState.getBlock() instanceof BlockStairs) {
|
||||||
@@ -141,6 +188,16 @@ public class Mirror {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Slabs
|
||||||
|
if (blockState.getBlock() instanceof BlockSlab) {
|
||||||
|
if (((BlockSlab) blockState.getBlock()).isDouble()) return blockState;
|
||||||
|
if (blockState.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.BOTTOM) {
|
||||||
|
return blockState.withProperty(BlockSlab.HALF, BlockSlab.EnumBlockHalf.TOP);
|
||||||
|
} else {
|
||||||
|
return blockState.withProperty(BlockSlab.HALF, BlockSlab.EnumBlockHalf.BOTTOM);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//Buttons, endrod, observer, piston
|
//Buttons, endrod, observer, piston
|
||||||
if (blockState.getBlock() instanceof BlockDirectional) {
|
if (blockState.getBlock() instanceof BlockDirectional) {
|
||||||
if (blockState.getValue(BlockDirectional.FACING) == EnumFacing.DOWN) {
|
if (blockState.getValue(BlockDirectional.FACING) == EnumFacing.DOWN) {
|
||||||
@@ -177,7 +234,7 @@ public class Mirror {
|
|||||||
|
|
||||||
if (oldBlockPos.getX() + 0.5 < m.position.x - m.radius || oldBlockPos.getX() + 0.5 > m.position.x + m.radius ||
|
if (oldBlockPos.getX() + 0.5 < m.position.x - m.radius || oldBlockPos.getX() + 0.5 > m.position.x + m.radius ||
|
||||||
oldBlockPos.getY() + 0.5 < m.position.y - m.radius || oldBlockPos.getY() + 0.5 > m.position.y + m.radius ||
|
oldBlockPos.getY() + 0.5 < m.position.y - m.radius || oldBlockPos.getY() + 0.5 > m.position.y + m.radius ||
|
||||||
oldBlockPos.getZ() + 0.5 < m.position.z - m.radius || oldBlockPos.getZ() + 0.5 > m.position.z+ m.radius)
|
oldBlockPos.getZ() + 0.5 < m.position.z - m.radius || oldBlockPos.getZ() + 0.5 > m.position.z + m.radius)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (m.mirrorX) {
|
if (m.mirrorX) {
|
||||||
@@ -199,7 +256,7 @@ public class Mirror {
|
|||||||
BlockPos newBlockPos = new BlockPos(x, oldBlockPos.getY(), oldBlockPos.getZ());
|
BlockPos newBlockPos = new BlockPos(x, oldBlockPos.getY(), oldBlockPos.getZ());
|
||||||
//break block
|
//break block
|
||||||
if (event.getWorld().isBlockLoaded(newBlockPos, true)) {
|
if (event.getWorld().isBlockLoaded(newBlockPos, true)) {
|
||||||
event.getWorld().setBlockToAir(newBlockPos);
|
breakBlock(event, newBlockPos);
|
||||||
}
|
}
|
||||||
if (m.mirrorY) breakMirrorY(event, m, newBlockPos);
|
if (m.mirrorY) breakMirrorY(event, m, newBlockPos);
|
||||||
if (m.mirrorZ) breakMirrorZ(event, m, newBlockPos);
|
if (m.mirrorZ) breakMirrorZ(event, m, newBlockPos);
|
||||||
@@ -211,7 +268,7 @@ public class Mirror {
|
|||||||
BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), y, oldBlockPos.getZ());
|
BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), y, oldBlockPos.getZ());
|
||||||
//place block
|
//place block
|
||||||
if (event.getWorld().isBlockLoaded(newBlockPos, true)) {
|
if (event.getWorld().isBlockLoaded(newBlockPos, true)) {
|
||||||
event.getWorld().setBlockToAir(newBlockPos);
|
breakBlock(event, newBlockPos);
|
||||||
}
|
}
|
||||||
if (m.mirrorZ) breakMirrorZ(event, m, newBlockPos);
|
if (m.mirrorZ) breakMirrorZ(event, m, newBlockPos);
|
||||||
}
|
}
|
||||||
@@ -222,14 +279,25 @@ public class Mirror {
|
|||||||
BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), oldBlockPos.getY(), z);
|
BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), oldBlockPos.getY(), z);
|
||||||
//place block
|
//place block
|
||||||
if (event.getWorld().isBlockLoaded(newBlockPos, true)) {
|
if (event.getWorld().isBlockLoaded(newBlockPos, true)) {
|
||||||
event.getWorld().setBlockToAir(newBlockPos);
|
breakBlock(event, newBlockPos);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void breakBlock(BlockEvent.BreakEvent event, BlockPos newBlockPos) {
|
||||||
|
//TODO check if can break
|
||||||
|
|
||||||
|
SurvivalHelper.dropBlock(event.getWorld(), newBlockPos, event.getPlayer());
|
||||||
|
event.getWorld().setBlockToAir(newBlockPos);
|
||||||
|
|
||||||
|
//Array synergy
|
||||||
|
BlockEvent.BreakEvent breakEvent = new BlockEvent.BreakEvent(event.getWorld(), newBlockPos, event.getState(), event.getPlayer());
|
||||||
|
Array.onBlockBroken(breakEvent);
|
||||||
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public static void onRender(RenderWorldLastEvent event) {
|
public static void onRender(RenderWorldLastEvent event) {
|
||||||
EntityPlayerSP player = Minecraft.getMinecraft().player;
|
EntityPlayer player = Minecraft.getMinecraft().player;
|
||||||
BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(player);
|
BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(player);
|
||||||
if (buildSettings == null) return;
|
if (buildSettings == null) return;
|
||||||
MirrorSettings m = buildSettings.getMirrorSettings();
|
MirrorSettings m = buildSettings.getMirrorSettings();
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
package nl.requios.effortlessbuilding;
|
package nl.requios.effortlessbuilding;
|
||||||
|
|
||||||
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.entity.player.EntityPlayerMP;
|
import net.minecraft.entity.player.EntityPlayerMP;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.EnumHand;
|
import net.minecraft.util.EnumHand;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraftforge.common.util.BlockSnapshot;
|
import net.minecraftforge.common.util.BlockSnapshot;
|
||||||
@@ -48,14 +50,27 @@ public class QuickReplace {
|
|||||||
if (!message.isBlockHit() || message.getBlockPos() == null) return;
|
if (!message.isBlockHit() || message.getBlockPos() == null) return;
|
||||||
|
|
||||||
BlockPos placedAgainstBlockPos = message.getBlockPos();
|
BlockPos placedAgainstBlockPos = message.getBlockPos();
|
||||||
//placedAgainstBlockPos = placedAgainstBlockPos.down();
|
|
||||||
|
//Get under tall grass and other replaceable blocks
|
||||||
|
if (player.world.getBlockState(placedAgainstBlockPos).getBlock().isReplaceable(player.world, placedAgainstBlockPos)) {
|
||||||
|
placedAgainstBlockPos = placedAgainstBlockPos.down();
|
||||||
|
}
|
||||||
|
|
||||||
IBlockState blockState = blockStates.get(player.getUniqueID());
|
IBlockState blockState = blockStates.get(player.getUniqueID());
|
||||||
|
|
||||||
|
SurvivalHelper.dropBlock(player.world, placedAgainstBlockPos, player);
|
||||||
player.world.setBlockState(placedAgainstBlockPos, blockState);
|
player.world.setBlockState(placedAgainstBlockPos, blockState);
|
||||||
|
|
||||||
|
//Shrink itemstack with 1
|
||||||
|
ItemStack itemStack = player.getHeldItem(player.swingingHand); //TODO check hand
|
||||||
|
if (!player.isCreative() && Block.getBlockFromItem(itemStack.getItem()) == blockState.getBlock()) {
|
||||||
|
itemStack.shrink(1);
|
||||||
|
}
|
||||||
|
|
||||||
//Mirror and Array synergy
|
//Mirror and Array synergy
|
||||||
BlockSnapshot blockSnapshot = new BlockSnapshot(player.world, placedAgainstBlockPos, blockState);
|
BlockSnapshot blockSnapshot = new BlockSnapshot(player.world, placedAgainstBlockPos, blockState);
|
||||||
BlockEvent.PlaceEvent placeEvent = new BlockEvent.PlaceEvent(blockSnapshot, blockState, player, EnumHand.MAIN_HAND);
|
BlockEvent.PlaceEvent placeEvent = new BlockEvent.PlaceEvent(blockSnapshot, blockState, player, EnumHand.MAIN_HAND);
|
||||||
Array.onBlockPlaced(placeEvent);
|
|
||||||
Mirror.onBlockPlaced(placeEvent);
|
Mirror.onBlockPlaced(placeEvent);
|
||||||
|
Array.onBlockPlaced(placeEvent);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package nl.requios.effortlessbuilding;
|
||||||
|
|
||||||
|
import net.minecraft.block.Block;
|
||||||
|
import net.minecraft.block.state.IBlockState;
|
||||||
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.util.math.BlockPos;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
import net.minecraftforge.items.ItemHandlerHelper;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class SurvivalHelper {
|
||||||
|
|
||||||
|
public static boolean canBreak(){
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean canPlace(){
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Gives items directly to player
|
||||||
|
public static void dropBlock(World world, BlockPos pos, EntityPlayer player){
|
||||||
|
if (player.isCreative()) return;
|
||||||
|
|
||||||
|
IBlockState blockState = world.getBlockState(pos);
|
||||||
|
|
||||||
|
List<ItemStack> drops = blockState.getBlock().getDrops(world, pos, blockState, 0);
|
||||||
|
for (ItemStack drop : drops)
|
||||||
|
{
|
||||||
|
ItemHandlerHelper.giveItemToPlayer(player, drop);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package nl.requios.effortlessbuilding.capability;
|
||||||
|
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
import net.minecraft.util.EnumFacing;
|
||||||
|
import net.minecraftforge.common.capabilities.Capability;
|
||||||
|
import net.minecraftforge.common.capabilities.ICapabilitySerializable;
|
||||||
|
import net.minecraftforge.items.CapabilityItemHandler;
|
||||||
|
import net.minecraftforge.items.IItemHandler;
|
||||||
|
import net.minecraftforge.items.ItemStackHandler;
|
||||||
|
import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
|
public class ItemHandlerCapabilityProvider implements ICapabilitySerializable<NBTTagCompound> {
|
||||||
|
IItemHandler itemHandler = new ItemStackHandler(ItemRandomizerBag.INV_SIZE);
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
|
||||||
|
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
|
||||||
|
return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
|
||||||
|
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
|
||||||
|
return (T) itemHandler;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public NBTTagCompound serializeNBT() {
|
||||||
|
return ((ItemStackHandler) itemHandler).serializeNBT();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deserializeNBT(NBTTagCompound nbt) {
|
||||||
|
((ItemStackHandler) itemHandler).deserializeNBT(nbt);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,110 @@
|
|||||||
|
package nl.requios.effortlessbuilding.gui;
|
||||||
|
|
||||||
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
|
import net.minecraft.inventory.ClickType;
|
||||||
|
import net.minecraft.inventory.Container;
|
||||||
|
import net.minecraft.inventory.IInventory;
|
||||||
|
import net.minecraft.inventory.Slot;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.util.EnumHand;
|
||||||
|
import net.minecraftforge.items.IItemHandler;
|
||||||
|
import net.minecraftforge.items.SlotItemHandler;
|
||||||
|
import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
|
||||||
|
|
||||||
|
public class RandomizerBagContainer extends Container {
|
||||||
|
|
||||||
|
private final IItemHandler bagInventory;
|
||||||
|
private final int sizeInventory;
|
||||||
|
|
||||||
|
private static final int INV_START = ItemRandomizerBag.INV_SIZE, INV_END = INV_START + 26,
|
||||||
|
HOTBAR_START = INV_END + 1, HOTBAR_END = HOTBAR_START + 8;
|
||||||
|
|
||||||
|
public RandomizerBagContainer(InventoryPlayer parInventoryPlayer, IItemHandler parIInventory) {
|
||||||
|
bagInventory = parIInventory;
|
||||||
|
sizeInventory = bagInventory.getSlots();
|
||||||
|
for (int i = 0; i < sizeInventory; ++i) {
|
||||||
|
this.addSlotToContainer(new SlotItemHandler(bagInventory, i, 44 + (18 * i), 20));
|
||||||
|
}
|
||||||
|
|
||||||
|
// add player inventory slots
|
||||||
|
int i;
|
||||||
|
for (i = 0; i < 3; ++i) {
|
||||||
|
for (int j = 0; j < 9; ++j) {
|
||||||
|
addSlotToContainer(new Slot(parInventoryPlayer, j + i * 9 + 9, 8 + j * 18, 51 + i * 18));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// add hotbar slots
|
||||||
|
for (i = 0; i < 9; ++i) {
|
||||||
|
addSlotToContainer(new Slot(parInventoryPlayer, i, 8 + i * 18, 109));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean canInteractWith(EntityPlayer playerIn) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ItemStack transferStackInSlot(EntityPlayer playerIn, int slotIndex) {
|
||||||
|
ItemStack itemstack = null;
|
||||||
|
Slot slot = this.inventorySlots.get(slotIndex);
|
||||||
|
|
||||||
|
if (slot != null && slot.getHasStack()) {
|
||||||
|
ItemStack itemstack1 = slot.getStack();
|
||||||
|
itemstack = itemstack1.copy();
|
||||||
|
|
||||||
|
// If item is in our custom inventory
|
||||||
|
if (slotIndex < INV_START) {
|
||||||
|
// try to place in player inventory / action bar
|
||||||
|
if (!this.mergeItemStack(itemstack1, INV_START, HOTBAR_END + 1, true)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
slot.onSlotChange(itemstack1, itemstack);
|
||||||
|
}
|
||||||
|
// Item is in inventory / hotbar, try to place in custom inventory or armor slots
|
||||||
|
else {
|
||||||
|
/**
|
||||||
|
* Implementation number 1: Shift-click into your custom inventory
|
||||||
|
*/
|
||||||
|
if (slotIndex >= INV_START) {
|
||||||
|
// place in custom inventory
|
||||||
|
if (!this.mergeItemStack(itemstack1, 0, INV_START, false)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if (itemstack1.getCount() == 0) {
|
||||||
|
slot.putStack(ItemStack.EMPTY);
|
||||||
|
} else {
|
||||||
|
slot.onSlotChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (itemstack1.getCount() == itemstack.getCount()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
slot.onTake(playerIn, itemstack1);
|
||||||
|
}
|
||||||
|
|
||||||
|
return itemstack;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* You should override this method to prevent the player from moving the stack that
|
||||||
|
* opened the inventory, otherwise if the player moves it, the inventory will not
|
||||||
|
* be able to save properly
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public ItemStack slotClick(int slot, int dragType, ClickType clickTypeIn, EntityPlayer player) {
|
||||||
|
// this will prevent the player from interacting with the item that opened the inventory:
|
||||||
|
if (slot >= 0 && getSlot(slot) != null && getSlot(slot).getStack() == player.getHeldItem(EnumHand.MAIN_HAND)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return super.slotClick(slot, dragType, clickTypeIn, player);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package nl.requios.effortlessbuilding.gui;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
import net.minecraft.client.renderer.GlStateManager;
|
||||||
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
import net.minecraftforge.items.IItemHandler;
|
||||||
|
import nl.requios.effortlessbuilding.EffortlessBuilding;
|
||||||
|
|
||||||
|
@SideOnly(Side.CLIENT)
|
||||||
|
public class RandomizerBagGuiContainer extends GuiContainer {
|
||||||
|
private static final ResourceLocation guiTextures =
|
||||||
|
new ResourceLocation(EffortlessBuilding.MODID + ":textures/gui/container/randomizerbag.png");
|
||||||
|
private final InventoryPlayer inventoryPlayer;
|
||||||
|
private final IItemHandler inventoryBag;
|
||||||
|
|
||||||
|
public RandomizerBagGuiContainer(InventoryPlayer inventoryPlayer, IItemHandler inventoryBag) {
|
||||||
|
super(new RandomizerBagContainer(inventoryPlayer, inventoryBag));
|
||||||
|
this.inventoryPlayer = inventoryPlayer;
|
||||||
|
this.inventoryBag = inventoryBag;
|
||||||
|
|
||||||
|
ySize = 134;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
|
||||||
|
drawDefaultBackground();
|
||||||
|
super.drawScreen(mouseX, mouseY, partialTicks);
|
||||||
|
this.renderHoveredToolTip(mouseX, mouseY);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
|
||||||
|
String s = "Randomizer Bag";
|
||||||
|
fontRenderer.drawString(s, 8, 6, 0x404040);
|
||||||
|
fontRenderer.drawString(inventoryPlayer.getDisplayName().getUnformattedText(), 8, ySize - 96 + 2, 0x404040);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
|
||||||
|
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
mc.getTextureManager().bindTexture(guiTextures);
|
||||||
|
int marginHorizontal = (width - xSize) / 2;
|
||||||
|
int marginVertical = (height - ySize) / 2;
|
||||||
|
drawTexturedModalRect(marginHorizontal, marginVertical, 0, 0, xSize, ySize);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package nl.requios.effortlessbuilding.gui;
|
||||||
|
|
||||||
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.util.EnumHand;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
import net.minecraftforge.fml.common.network.IGuiHandler;
|
||||||
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
import net.minecraftforge.items.CapabilityItemHandler;
|
||||||
|
import nl.requios.effortlessbuilding.EffortlessBuilding;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
|
public class RandomizerBagGuiHandler implements IGuiHandler {
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
|
||||||
|
if (ID == EffortlessBuilding.RANDOMIZER_BAG_GUI) {
|
||||||
|
// Use the player's held item to create the container
|
||||||
|
return new RandomizerBagContainer(player.inventory,
|
||||||
|
player.getHeldItem(EnumHand.MAIN_HAND).getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null));
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
@SideOnly(Side.CLIENT)
|
||||||
|
public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
|
||||||
|
if (ID == EffortlessBuilding.RANDOMIZER_BAG_GUI) {
|
||||||
|
// Use the player's held item to create the client-side gui container
|
||||||
|
return new RandomizerBagGuiContainer(player.inventory,
|
||||||
|
player.getHeldItem(EnumHand.MAIN_HAND).getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null));
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package nl.requios.effortlessbuilding.inventory;
|
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
|
||||||
import net.minecraft.inventory.Container;
|
|
||||||
|
|
||||||
public class RandomizerBagContainer extends Container {
|
|
||||||
@Override
|
|
||||||
public boolean canInteractWith(EntityPlayer playerIn) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
package nl.requios.effortlessbuilding.inventory;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
|
||||||
import net.minecraft.inventory.Container;
|
|
||||||
|
|
||||||
public class RandomizerBagGuiContainer extends GuiContainer {
|
|
||||||
public RandomizerBagGuiContainer(Container inventorySlotsIn) {
|
|
||||||
super(inventorySlotsIn);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,144 +0,0 @@
|
|||||||
package nl.requios.effortlessbuilding.inventory;
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
import net.minecraft.nbt.NBTTagList;
|
|
||||||
import net.minecraftforge.items.IItemHandler;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
public class RandomizerBagInventory implements IItemHandler {
|
|
||||||
|
|
||||||
//Reference to NBT data
|
|
||||||
private final ItemStack invItem;
|
|
||||||
|
|
||||||
public static final int INV_SIZE = 5;
|
|
||||||
|
|
||||||
private ItemStack[] inventory = new ItemStack[INV_SIZE];
|
|
||||||
|
|
||||||
public RandomizerBagInventory(ItemStack invItem) {
|
|
||||||
this.invItem = invItem;
|
|
||||||
|
|
||||||
if (!invItem.hasTagCompound()) {
|
|
||||||
invItem.setTagCompound(new NBTTagCompound());
|
|
||||||
}
|
|
||||||
|
|
||||||
readFromNBT(invItem.getTagCompound());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getSlots() {
|
|
||||||
return INV_SIZE;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public ItemStack getStackInSlot(int slot) {
|
|
||||||
return inventory[slot];
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) {
|
|
||||||
ItemStack slotStack = getStackInSlot(slot);
|
|
||||||
if (slotStack.getCount() == 0) {
|
|
||||||
setInventorySlotContents(slot, stack);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
if (getSlotLimit(slot) - slotStack.getCount() < stack.getCount()) {
|
|
||||||
//Not enough place remaining, split stack
|
|
||||||
slotStack.setCount(getSlotLimit(slot));
|
|
||||||
onInventoryChanged();
|
|
||||||
stack.copy().shrink(getSlotLimit(slot) - slotStack.getCount());
|
|
||||||
//TODO make proper
|
|
||||||
return stack;
|
|
||||||
} else {
|
|
||||||
slotStack.grow(stack.getCount());
|
|
||||||
onInventoryChanged();
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public ItemStack extractItem(int slot, int amount, boolean simulate) {
|
|
||||||
ItemStack stack = getStackInSlot(slot);
|
|
||||||
if (stack == null) return stack;
|
|
||||||
|
|
||||||
if (stack.getCount() > amount) {
|
|
||||||
stack = stack.splitStack(amount);
|
|
||||||
onInventoryChanged();
|
|
||||||
} else {
|
|
||||||
setInventorySlotContents(slot, null);
|
|
||||||
}
|
|
||||||
return stack;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getSlotLimit(int slot) {
|
|
||||||
return 64;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onInventoryChanged() {
|
|
||||||
for (int i = 0; i < getSlotLimit(0); ++i) {
|
|
||||||
if (getStackInSlot(i) != null && getStackInSlot(i).getCount() == 0) {
|
|
||||||
inventory[i] = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
writeToNBT(invItem.getTagCompound());
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setInventorySlotContents(int slot, ItemStack stack) {
|
|
||||||
inventory[slot] = stack;
|
|
||||||
|
|
||||||
if (stack != null && stack.getCount() > getSlotLimit(slot)) {
|
|
||||||
stack.setCount(getSlotLimit(slot));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Don't forget this line or your inventory will not be saved!
|
|
||||||
onInventoryChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void readFromNBT(NBTTagCompound compound) {
|
|
||||||
// Gets the custom taglist we wrote to this compound, if any
|
|
||||||
// 1.7.2+ change to compound.getTagList("ItemInventory", Constants.NBT.TAG_COMPOUND);
|
|
||||||
NBTTagList items = compound.getTagList("ItemInventory", 0);
|
|
||||||
|
|
||||||
for (int i = 0; i < items.tagCount(); ++i) {
|
|
||||||
// 1.7.2+ change to items.getCompoundTagAt(i)
|
|
||||||
NBTTagCompound item = items.getCompoundTagAt(i);
|
|
||||||
int slot = item.getInteger("Slot");
|
|
||||||
|
|
||||||
// Just double-checking that the saved slot index is within our inventory array bounds
|
|
||||||
if (slot >= 0 && slot < getSlots()) {
|
|
||||||
inventory[slot] = new ItemStack(item);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A custom method to write our inventory to an ItemStack's NBT compound
|
|
||||||
*/
|
|
||||||
public void writeToNBT(NBTTagCompound tagcompound) {
|
|
||||||
// Create a new NBT Tag List to store itemstacks as NBT Tags
|
|
||||||
NBTTagList items = new NBTTagList();
|
|
||||||
|
|
||||||
for (int i = 0; i < getSlots(); ++i) {
|
|
||||||
// Only write stacks that contain items
|
|
||||||
if (getStackInSlot(i) != null) {
|
|
||||||
// Make a new NBT Tag Compound to write the itemstack and slot index to
|
|
||||||
NBTTagCompound item = new NBTTagCompound();
|
|
||||||
item.setInteger("Slot", i);
|
|
||||||
// Writes the itemstack in slot(i) to the Tag Compound we just made
|
|
||||||
getStackInSlot(i).writeToNBT(item);
|
|
||||||
|
|
||||||
// add the tag compound to our tag list
|
|
||||||
items.appendTag(item);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Add the TagList to the ItemStack's Tag Compound with the name "ItemInventory"
|
|
||||||
tagcompound.setTag("ItemInventory", items);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
package nl.requios.effortlessbuilding.inventory;
|
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
import net.minecraftforge.fml.common.network.IGuiHandler;
|
|
||||||
import nl.requios.effortlessbuilding.EffortlessBuilding;
|
|
||||||
import nl.requios.effortlessbuilding.inventory.RandomizerBagContainer;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
public class RandomizerGuiHandler implements IGuiHandler {
|
|
||||||
@Nullable
|
|
||||||
@Override
|
|
||||||
public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
|
|
||||||
if (ID == EffortlessBuilding.RANDOMIZER_BAG_GUI) {
|
|
||||||
// Use the player's held item to create the inventory
|
|
||||||
return new RandomizerBagContainer();
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
@Override
|
|
||||||
public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
|
|
||||||
if (ID == EffortlessBuilding.RANDOMIZER_BAG_GUI) {
|
|
||||||
// We have to cast the new container as our custom class
|
|
||||||
// and pass in currently held item for the inventory
|
|
||||||
return new RandomizerBagGuiContainer(new RandomizerBagContainer());
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,20 +1,41 @@
|
|||||||
package nl.requios.effortlessbuilding.item;
|
package nl.requios.effortlessbuilding.item;
|
||||||
|
|
||||||
|
import net.minecraft.block.Block;
|
||||||
|
import net.minecraft.block.state.IBlockState;
|
||||||
|
import net.minecraft.client.util.ITooltipFlag;
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.util.ActionResult;
|
import net.minecraft.util.ActionResult;
|
||||||
import net.minecraft.util.EnumActionResult;
|
import net.minecraft.util.EnumActionResult;
|
||||||
import net.minecraft.util.EnumFacing;
|
import net.minecraft.util.EnumFacing;
|
||||||
import net.minecraft.util.EnumHand;
|
import net.minecraft.util.EnumHand;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
|
import net.minecraft.util.text.TextFormatting;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
||||||
|
import net.minecraftforge.common.util.BlockSnapshot;
|
||||||
|
import net.minecraftforge.event.world.BlockEvent;
|
||||||
|
import net.minecraftforge.items.CapabilityItemHandler;
|
||||||
|
import net.minecraftforge.items.IItemHandler;
|
||||||
|
import nl.requios.effortlessbuilding.Array;
|
||||||
import nl.requios.effortlessbuilding.EffortlessBuilding;
|
import nl.requios.effortlessbuilding.EffortlessBuilding;
|
||||||
|
import nl.requios.effortlessbuilding.Mirror;
|
||||||
|
import nl.requios.effortlessbuilding.capability.ItemHandlerCapabilityProvider;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
public class ItemRandomizerBag extends Item {
|
public class ItemRandomizerBag extends Item {
|
||||||
|
public static final int INV_SIZE = 5;
|
||||||
|
|
||||||
public ItemRandomizerBag(){
|
private static Random rand = new Random(1337);
|
||||||
|
|
||||||
|
public ItemRandomizerBag() {
|
||||||
this.setRegistryName(EffortlessBuilding.MODID, "randomizer_bag");
|
this.setRegistryName(EffortlessBuilding.MODID, "randomizer_bag");
|
||||||
this.setUnlocalizedName(this.getRegistryName().toString());
|
this.setUnlocalizedName(this.getRegistryName().toString());
|
||||||
|
|
||||||
@@ -23,34 +44,132 @@ public class ItemRandomizerBag extends Item {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
|
public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
|
||||||
|
|
||||||
if (worldIn.isRemote) return EnumActionResult.PASS;
|
if (player.isSneaking()) {
|
||||||
EffortlessBuilding.log(player, "onItemUse");
|
if (world.isRemote) return EnumActionResult.SUCCESS;
|
||||||
|
|
||||||
if (player.isSneaking()){
|
|
||||||
//Open inventory
|
//Open inventory
|
||||||
player.openGui(EffortlessBuilding.instance, EffortlessBuilding.RANDOMIZER_BAG_GUI, worldIn, 0, 0, 0);
|
player.openGui(EffortlessBuilding.instance, EffortlessBuilding.RANDOMIZER_BAG_GUI, world, 0, 0, 0);
|
||||||
} else {
|
} else {
|
||||||
//Place block
|
if (world.isRemote) return EnumActionResult.SUCCESS;
|
||||||
|
//Use item
|
||||||
|
//Get bag inventory
|
||||||
|
ItemStack bag = player.getHeldItem(hand);
|
||||||
|
IItemHandler bagInventory = getBagInventory(bag);
|
||||||
|
if (bagInventory == null)
|
||||||
|
return EnumActionResult.FAIL;
|
||||||
|
|
||||||
|
int randomSlot = pickRandomSlot(bagInventory);
|
||||||
|
if (randomSlot < 0 || randomSlot > bagInventory.getSlots()) return EnumActionResult.FAIL;
|
||||||
|
|
||||||
|
ItemStack toPlace = bagInventory.getStackInSlot(randomSlot);
|
||||||
|
|
||||||
|
if (toPlace.isEmpty()) return EnumActionResult.FAIL;
|
||||||
|
|
||||||
|
//Previously: use onItemUse to place block (no synergy)
|
||||||
|
//bag.setItemDamage(toPlace.getMetadata());
|
||||||
|
//toPlace.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ);
|
||||||
|
|
||||||
|
if (!world.getBlockState(pos).getBlock().isReplaceable(world, pos)) {
|
||||||
|
pos = pos.offset(facing);
|
||||||
|
}
|
||||||
|
|
||||||
|
IBlockState blockState = Block.getBlockFromItem(toPlace.getItem()).getStateForPlacement(world, pos, facing,
|
||||||
|
hitX, hitY, hitZ, toPlace.getMetadata(), player, hand);
|
||||||
|
world.setBlockState(pos, blockState);
|
||||||
|
|
||||||
|
//Synergy
|
||||||
|
BlockSnapshot blockSnapshot = new BlockSnapshot(player.world, pos, blockState);
|
||||||
|
BlockEvent.PlaceEvent placeEvent = new BlockEvent.PlaceEvent(blockSnapshot, blockState, player, hand);
|
||||||
|
Mirror.onBlockPlaced(placeEvent);
|
||||||
|
Array.onBlockPlaced(placeEvent);
|
||||||
}
|
}
|
||||||
return EnumActionResult.PASS;
|
return EnumActionResult.SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) {
|
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
|
||||||
if (worldIn.isRemote) return new ActionResult<>(EnumActionResult.PASS, playerIn.getHeldItem(handIn));
|
|
||||||
EffortlessBuilding.log(playerIn, "onItemRightClick");
|
|
||||||
|
|
||||||
//Open inventory
|
if (player.isSneaking()) {
|
||||||
playerIn.openGui(EffortlessBuilding.instance, EffortlessBuilding.RANDOMIZER_BAG_GUI, worldIn, 0, 0, 0);
|
if (world.isRemote) return new ActionResult<>(EnumActionResult.SUCCESS, player.getHeldItem(hand));
|
||||||
|
//Open inventory
|
||||||
|
player.openGui(EffortlessBuilding.instance, EffortlessBuilding.RANDOMIZER_BAG_GUI, world, 0, 0, 0);
|
||||||
|
} else {
|
||||||
|
//Use item
|
||||||
|
//Get bag inventory
|
||||||
|
ItemStack bag = player.getHeldItem(hand);
|
||||||
|
IItemHandler bagInventory = getBagInventory(bag);
|
||||||
|
if (bagInventory == null)
|
||||||
|
return new ActionResult<>(EnumActionResult.FAIL, player.getHeldItem(hand));
|
||||||
|
|
||||||
return new ActionResult<>(EnumActionResult.PASS, playerIn.getHeldItem(handIn));
|
int randomSlot = pickRandomSlot(bagInventory);
|
||||||
|
if (randomSlot < 0 || randomSlot > bagInventory.getSlots())
|
||||||
|
return new ActionResult<>(EnumActionResult.FAIL, player.getHeldItem(hand));
|
||||||
|
|
||||||
|
ItemStack toUse = bagInventory.getStackInSlot(randomSlot);
|
||||||
|
if (toUse.isEmpty()) return new ActionResult<>(EnumActionResult.FAIL, player.getHeldItem(hand));
|
||||||
|
|
||||||
|
return toUse.useItemRightClick(world, player, hand);
|
||||||
|
}
|
||||||
|
return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the inventory of a randomizer bag by checking the capability.
|
||||||
|
*
|
||||||
|
* @param bag
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static IItemHandler getBagInventory(ItemStack bag) {
|
||||||
|
if (!bag.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) return null;
|
||||||
|
return bag.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pick a random slot from the bag. Empty slots will never get chosen.
|
||||||
|
*
|
||||||
|
* @param bagInventory
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static int pickRandomSlot(IItemHandler bagInventory) {
|
||||||
|
//Find how many stacks are non-empty, and save them in a list
|
||||||
|
int nonempty = 0;
|
||||||
|
List<ItemStack> nonEmptyStacks = new ArrayList<>(INV_SIZE);
|
||||||
|
List<Integer> originalSlots = new ArrayList<>(INV_SIZE);
|
||||||
|
for (int i = 0; i < bagInventory.getSlots(); i++) {
|
||||||
|
ItemStack stack = bagInventory.getStackInSlot(i);
|
||||||
|
if (!stack.isEmpty()) {
|
||||||
|
nonempty++;
|
||||||
|
nonEmptyStacks.add(stack);
|
||||||
|
originalSlots.add(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (nonEmptyStacks.size() != originalSlots.size())
|
||||||
|
throw new Error("NonEmptyStacks and OriginalSlots not same size");
|
||||||
|
|
||||||
|
if (nonempty == 0) return -1;
|
||||||
|
|
||||||
|
//Pick random slot
|
||||||
|
int randomSlot = rand.nextInt(nonempty);
|
||||||
|
|
||||||
|
return originalSlots.get(randomSlot);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getMaxItemUseDuration(ItemStack stack) {
|
public int getMaxItemUseDuration(ItemStack stack) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
||||||
|
return new ItemHandlerCapabilityProvider();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag) {
|
||||||
|
tooltip.add(TextFormatting.BLUE + "Rightclick" + TextFormatting.GRAY + " to place a random block");
|
||||||
|
tooltip.add(TextFormatting.BLUE + "Sneak + rightclick" + TextFormatting.GRAY + " to open inventory");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
|
|||||||
import nl.requios.effortlessbuilding.Array;
|
import nl.requios.effortlessbuilding.Array;
|
||||||
import nl.requios.effortlessbuilding.BuildSettingsManager;
|
import nl.requios.effortlessbuilding.BuildSettingsManager;
|
||||||
import nl.requios.effortlessbuilding.BuildSettingsManager.BuildSettings;
|
import nl.requios.effortlessbuilding.BuildSettingsManager.BuildSettings;
|
||||||
|
import nl.requios.effortlessbuilding.EffortlessBuilding;
|
||||||
import nl.requios.effortlessbuilding.Mirror;
|
import nl.requios.effortlessbuilding.Mirror;
|
||||||
|
|
||||||
public class BuildSettingsMessage implements IMessage {
|
public class BuildSettingsMessage implements IMessage {
|
||||||
@@ -84,7 +85,7 @@ public class BuildSettingsMessage implements IMessage {
|
|||||||
//EffortlessBuilding.log("message received on " + ctx.side + " side");
|
//EffortlessBuilding.log("message received on " + ctx.side + " side");
|
||||||
|
|
||||||
// This is the player the packet was sent to the server from
|
// This is the player the packet was sent to the server from
|
||||||
EntityPlayer player = (ctx.side.isClient() ? Minecraft.getMinecraft().player : ctx.getServerHandler().player);
|
EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
|
||||||
// The value that was sent
|
// The value that was sent
|
||||||
BuildSettings buildSettings = message.buildSettings;
|
BuildSettings buildSettings = message.buildSettings;
|
||||||
Mirror.MirrorSettings m = buildSettings.getMirrorSettings();
|
Mirror.MirrorSettings m = buildSettings.getMirrorSettings();
|
||||||
@@ -98,9 +99,9 @@ public class BuildSettingsMessage implements IMessage {
|
|||||||
a.count = Math.max(0, a.count);
|
a.count = Math.max(0, a.count);
|
||||||
|
|
||||||
// Execute the action on the main server thread by adding it as a scheduled task
|
// Execute the action on the main server thread by adding it as a scheduled task
|
||||||
IThreadListener threadListener = (ctx.side.isClient() ? Minecraft.getMinecraft() : ((EntityPlayerMP) player).getServerWorld());
|
IThreadListener threadListener = EffortlessBuilding.proxy.getThreadListenerFromContext(ctx);
|
||||||
threadListener.addScheduledTask(() -> {
|
threadListener.addScheduledTask(() -> {
|
||||||
EntityPlayer p = (ctx.side.isClient() ? Minecraft.getMinecraft().player : ctx.getServerHandler().player);
|
EntityPlayer p = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
|
||||||
BuildSettingsManager.setBuildSettings(p, buildSettings);
|
BuildSettingsManager.setBuildSettings(p, buildSettings);
|
||||||
});
|
});
|
||||||
// No response packet
|
// No response packet
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
|
|||||||
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
|
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
|
||||||
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
|
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
|
import nl.requios.effortlessbuilding.EffortlessBuilding;
|
||||||
import nl.requios.effortlessbuilding.QuickReplace;
|
import nl.requios.effortlessbuilding.QuickReplace;
|
||||||
import nl.requios.effortlessbuilding.proxy.ClientProxy;
|
import nl.requios.effortlessbuilding.proxy.ClientProxy;
|
||||||
|
|
||||||
@@ -77,7 +78,7 @@ public class QuickReplaceMessage implements IMessage {
|
|||||||
|
|
||||||
} else {
|
} else {
|
||||||
//Received serverside
|
//Received serverside
|
||||||
ctx.getServerHandler().player.getServerWorld().addScheduledTask(() -> {
|
EffortlessBuilding.proxy.getThreadListenerFromContext(ctx).addScheduledTask(() -> {
|
||||||
QuickReplace.onMessageReceived(ctx.getServerHandler().player, message);
|
QuickReplace.onMessageReceived(ctx.getServerHandler().player, message);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,9 @@ import net.minecraft.client.entity.EntityPlayerSP;
|
|||||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||||
import net.minecraft.client.settings.KeyBinding;
|
import net.minecraft.client.settings.KeyBinding;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.entity.player.EntityPlayerMP;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.util.IThreadListener;
|
||||||
import net.minecraft.util.math.RayTraceResult;
|
import net.minecraft.util.math.RayTraceResult;
|
||||||
import net.minecraft.util.text.TextFormatting;
|
import net.minecraft.util.text.TextFormatting;
|
||||||
import net.minecraftforge.client.event.ModelRegistryEvent;
|
import net.minecraftforge.client.event.ModelRegistryEvent;
|
||||||
@@ -42,8 +44,8 @@ public class ClientProxy implements IProxy {
|
|||||||
keyBindings = new KeyBinding[2];
|
keyBindings = new KeyBinding[2];
|
||||||
|
|
||||||
// instantiate the key bindings
|
// instantiate the key bindings
|
||||||
keyBindings[0] = new KeyBinding("key.hud.desc", Keyboard.KEY_NUMPAD0, "key.effortlessbuilding.category");
|
keyBindings[0] = new KeyBinding("key.hud.desc", Keyboard.KEY_ADD, "key.effortlessbuilding.category");
|
||||||
keyBindings[1] = new KeyBinding("key.replace.desc", Keyboard.KEY_NUMPAD1, "key.effortlessbuilding.category");
|
keyBindings[1] = new KeyBinding("key.replace.desc", Keyboard.KEY_SUBTRACT, "key.effortlessbuilding.category");
|
||||||
|
|
||||||
// register all the key bindings
|
// register all the key bindings
|
||||||
for (int i = 0; i < keyBindings.length; ++i) {
|
for (int i = 0; i < keyBindings.length; ++i) {
|
||||||
@@ -58,7 +60,12 @@ public class ClientProxy implements IProxy {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public EntityPlayer getPlayerEntityFromContext(MessageContext ctx) {
|
public EntityPlayer getPlayerEntityFromContext(MessageContext ctx) {
|
||||||
return (ctx.side.isClient() ? Minecraft.getMinecraft().player : EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx));
|
return (ctx.side.isClient() ? Minecraft.getMinecraft().player : ctx.getServerHandler().player);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IThreadListener getThreadListenerFromContext(MessageContext ctx) {
|
||||||
|
return (ctx.side.isClient() ? Minecraft.getMinecraft() : ((EntityPlayerMP) getPlayerEntityFromContext(ctx)).getServerWorld());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package nl.requios.effortlessbuilding.proxy;
|
package nl.requios.effortlessbuilding.proxy;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.util.IThreadListener;
|
||||||
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
|
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
|
||||||
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
|
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
|
||||||
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
||||||
@@ -33,8 +34,10 @@ public interface IProxy
|
|||||||
/**
|
/**
|
||||||
* Returns a side-appropriate EntityPlayer for use during message handling.
|
* Returns a side-appropriate EntityPlayer for use during message handling.
|
||||||
*
|
*
|
||||||
* @param parContext the context
|
* @param ctx the context
|
||||||
* @return the player entity from context
|
* @return the player entity from context
|
||||||
*/
|
*/
|
||||||
EntityPlayer getPlayerEntityFromContext(MessageContext parContext);
|
EntityPlayer getPlayerEntityFromContext(MessageContext ctx);
|
||||||
|
|
||||||
|
IThreadListener getThreadListenerFromContext(MessageContext ctx);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,22 @@
|
|||||||
package nl.requios.effortlessbuilding.proxy;
|
package nl.requios.effortlessbuilding.proxy;
|
||||||
|
|
||||||
|
import net.minecraft.client.entity.AbstractClientPlayer;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.entity.player.EntityPlayerMP;
|
||||||
|
import net.minecraft.util.IThreadListener;
|
||||||
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
|
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
|
||||||
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
|
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
|
||||||
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
||||||
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
|
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
|
||||||
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
|
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
|
||||||
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
|
import nl.requios.effortlessbuilding.EffortlessBuilding;
|
||||||
|
import nl.requios.effortlessbuilding.network.BuildSettingsMessage;
|
||||||
|
import nl.requios.effortlessbuilding.network.QuickReplaceMessage;
|
||||||
|
|
||||||
public class ServerProxy implements IProxy
|
public class ServerProxy implements IProxy
|
||||||
{
|
{
|
||||||
|
//Only physical server! Singleplayer server is seen as clientproxy
|
||||||
@Override
|
@Override
|
||||||
public void preInit(FMLPreInitializationEvent event)
|
public void preInit(FMLPreInitializationEvent event)
|
||||||
{
|
{
|
||||||
@@ -35,4 +43,9 @@ public class ServerProxy implements IProxy
|
|||||||
{
|
{
|
||||||
return ctx.getServerHandler().player;
|
return ctx.getServerHandler().player;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IThreadListener getThreadListenerFromContext(MessageContext ctx) {
|
||||||
|
return ((EntityPlayerMP) getPlayerEntityFromContext(ctx)).getServerWorld();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"parent": "item/generated",
|
"parent": "item/generated",
|
||||||
"textures": {
|
"textures": {
|
||||||
"layer0": "items/fireball"
|
"layer0": "effortlessbuilding:items/randomizerbag"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"type": "minecraft:crafting_shaped",
|
||||||
|
"pattern": [
|
||||||
|
" # ",
|
||||||
|
"#O#",
|
||||||
|
" # "
|
||||||
|
],
|
||||||
|
"key": {
|
||||||
|
"#": {
|
||||||
|
"item": "minecraft:leather"
|
||||||
|
},
|
||||||
|
"O": {
|
||||||
|
"item": "minecraft:planks",
|
||||||
|
"data": 32767
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"result": {
|
||||||
|
"item": "effortlessbuilding:randomizer_bag"
|
||||||
|
}
|
||||||
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 376 B |
Binary file not shown.
|
After Width: | Height: | Size: 358 B |
Binary file not shown.
|
After Width: | Height: | Size: 358 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
@@ -5,7 +5,7 @@
|
|||||||
"description": "Makes building easier by providing tools like mirrors, arrays, quickreplace and a block randomizer.",
|
"description": "Makes building easier by providing tools like mirrors, arrays, quickreplace and a block randomizer.",
|
||||||
"version": "${version}",
|
"version": "${version}",
|
||||||
"mcversion": "${mcversion}",
|
"mcversion": "${mcversion}",
|
||||||
"url": "https://requios.nl/",
|
"url": "https://minecraft.curseforge.com/projects/effortless-building",
|
||||||
"updateUrl": "",
|
"updateUrl": "",
|
||||||
"authorList": ["Requios"],
|
"authorList": ["Requios"],
|
||||||
"credits": "",
|
"credits": "",
|
||||||
|
|||||||
Reference in New Issue
Block a user