diff --git a/src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityPanelCreator.java b/src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityPanelCreator.java index 8d7ae4c..1364dfd 100644 --- a/src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityPanelCreator.java +++ b/src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityPanelCreator.java @@ -23,6 +23,7 @@ import blusunrize.immersiveengineering.common.util.IELogger; import blusunrize.immersiveengineering.common.util.Utils; import blusunrize.immersiveengineering.common.util.inventory.IIEInventory; import malte0811.industrialWires.IndustrialWires; +import malte0811.industrialWires.blocks.IBlockBoundsIW; import malte0811.industrialWires.blocks.INetGUI; import malte0811.industrialWires.blocks.TileEntityIWBase; import malte0811.industrialWires.controlpanel.MessageType; @@ -34,12 +35,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.math.AxisAlignedBB; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -public class TileEntityPanelCreator extends TileEntityIWBase implements IIEInventory, INetGUI { +public class TileEntityPanelCreator extends TileEntityIWBase implements IIEInventory, INetGUI, IBlockBoundsIW { public List components = new ArrayList<>(); public float height = 0.5F; public ItemStack[] inv = new ItemStack[1]; @@ -154,4 +156,10 @@ public class TileEntityPanelCreator extends TileEntityIWBase implements IIEInven IBlockState state = worldObj.getBlockState(pos); worldObj.notifyBlockUpdate(pos, state, state, 3); } + + private static final AxisAlignedBB aabb = new AxisAlignedBB(0, 0,0, 1, 14/16D, 1); + @Override + public AxisAlignedBB getBoundingBox() { + return aabb; + } } \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/blockstates/control_panel.json b/src/main/resources/assets/industrialwires/blockstates/control_panel.json index d2343d1..ae89162 100644 --- a/src/main/resources/assets/industrialwires/blockstates/control_panel.json +++ b/src/main/resources/assets/industrialwires/blockstates/control_panel.json @@ -63,8 +63,7 @@ "textures": {"all": "industrialwires:blocks/control_panel"} }, "creator": { - "model": "cube_all", - "textures": {"all": "minecraft:blocks/diamond_block"} + "model":"industrialwires:panel_creator.obj" } }, "inventory,type=rs_wire": { @@ -84,10 +83,19 @@ "textures": {"all": "industrialwires:blocks/control_panel"} }, "inventory,type=creator": { - "model":"industrialwires:block/rs_panel_conn.obj"//TODO change! + "model":"industrialwires:panel_creator.obj", + "transform": { + "scale": [ 0.5, 0.5, 0.5 ], + "firstperson_righthand": { "translation": [ 0, 0.25, 0.125 ]}, + "firstperson_lefthand": { "translation": [ 0, 0.25, 0.125 ]}, + "thirdperson_righthand": { "translation": [ -0.0625, 0.125, 0.1875 ], "rotation": [{ "x": 70 }, { "y": 70 }]}, + "thirdperson_lefthand": { "translation": [ -0.0625, 0.125, 0.1875 ], "rotation": [{ "x": 70 }, { "y": 70 }]}, + "fixed": {"scale": [ 2,2,2 ], "translation": [ 0, 0, 0 ], "rotation": [{ "y": -90 }]}, + "gui": { "translation": [ 0, 0.0625, 0 ], "rotation": [{ "x": 30 },{ "y": 135 },{ "z": 0 }], "scale": [ 1.5, 1.5, 1.5 ] } + } }, "inventory,type=top": { - "model":"industrialwires:block/rs_panel_conn.obj" + "model":"industrialwires:block/panel_creator.obj"//Doesn't matter, this will be overridden in code } } diff --git a/src/main/resources/assets/industrialwires/models/block/panel_creator.mtl b/src/main/resources/assets/industrialwires/models/block/panel_creator.mtl new file mode 100644 index 0000000..92124a3 --- /dev/null +++ b/src/main/resources/assets/industrialwires/models/block/panel_creator.mtl @@ -0,0 +1,2 @@ +newmtl panel_creator +map_Ka industrialwires:blocks/panel_creator diff --git a/src/main/resources/assets/industrialwires/models/block/panel_creator.obj b/src/main/resources/assets/industrialwires/models/block/panel_creator.obj new file mode 100644 index 0000000..ead8730 --- /dev/null +++ b/src/main/resources/assets/industrialwires/models/block/panel_creator.obj @@ -0,0 +1,464 @@ +mtllib panel_creator.mtl +usemtl panel_creator +o panel_creator +v 0.187500 0.312500 0.625000 +v 0.187500 0.375000 0.625000 +v 0.187500 0.312500 0.437500 +v 0.187500 0.375000 0.437500 +v 0.375000 0.312500 0.625000 +v 0.375000 0.375000 0.625000 +v 0.375000 0.312500 0.437500 +v 0.375000 0.375000 0.437500 +v 0.250000 0.187500 0.562500 +v 0.250000 0.250000 0.562500 +v 0.250000 0.187500 0.500000 +v 0.250000 0.250000 0.500000 +v 0.312500 0.187500 0.562500 +v 0.312500 0.250000 0.562500 +v 0.312500 0.187500 0.500000 +v 0.312500 0.250000 0.500000 +v 0.218750 0.250000 0.593750 +v 0.218750 0.312500 0.593750 +v 0.218750 0.250000 0.468750 +v 0.218750 0.312500 0.468750 +v 0.343750 0.250000 0.593750 +v 0.343750 0.312500 0.593750 +v 0.343750 0.250000 0.468750 +v 0.343750 0.312500 0.468750 +v 0.250000 0.375000 0.562500 +v 0.250000 0.500000 0.562500 +v 0.250000 0.375000 0.500000 +v 0.250000 0.500000 0.500000 +v 0.312500 0.375000 0.562500 +v 0.312500 0.500000 0.562500 +v 0.312500 0.375000 0.500000 +v 0.312500 0.500000 0.500000 +v 0.000000 -0.000000 1.000000 +v 0.000000 0.125000 1.000000 +v 0.000000 0.000000 0.000000 +v 0.000000 0.125000 0.000000 +v 1.000000 -0.000000 1.000000 +v 1.000000 0.125000 1.000000 +v 1.000000 0.000000 0.000000 +v 1.000000 0.125000 0.000000 +v 0.937500 0.125000 1.000000 +v 0.937500 0.875000 1.000000 +v 0.937500 0.125000 0.937500 +v 0.937500 0.875000 0.937500 +v 1.000000 0.125000 1.000000 +v 1.000000 0.875000 1.000000 +v 1.000000 0.125000 0.937500 +v 1.000000 0.875000 0.937500 +v 0.062500 0.500000 0.937500 +v 0.062500 0.562500 0.937500 +v 0.937500 0.500000 0.937500 +v 0.937500 0.562500 0.937500 +v 0.062500 0.500000 1.000000 +v 0.062500 0.562500 1.000000 +v 0.937500 0.500000 1.000000 +v 0.937500 0.562500 1.000000 +v 0.062500 0.500000 0.500000 +v 0.062500 0.562500 0.500000 +v 0.937500 0.500000 0.500000 +v 0.937500 0.562500 0.500000 +v 0.062500 0.500000 0.562500 +v 0.062500 0.562500 0.562500 +v 0.937500 0.500000 0.562500 +v 0.937500 0.562500 0.562500 +v 0.937500 0.125000 0.062500 +v 0.937500 0.875000 0.062500 +v 0.937500 0.125000 0.000000 +v 0.937500 0.875000 0.000000 +v 1.000000 0.125000 0.062500 +v 1.000000 0.875000 0.062500 +v 1.000000 0.125000 0.000000 +v 1.000000 0.875000 0.000000 +v 0.000000 0.125000 0.062500 +v 0.000000 0.875000 0.062500 +v 0.000000 0.125000 0.000000 +v 0.000000 0.875000 0.000000 +v 0.062500 0.125000 0.062500 +v 0.062500 0.875000 0.062500 +v 0.062500 0.125000 0.000000 +v 0.062500 0.875000 0.000000 +v 0.000000 0.125000 1.000000 +v 0.000000 0.875000 1.000000 +v 0.000000 0.125000 0.937500 +v 0.000000 0.875000 0.937500 +v 0.062500 0.125000 1.000000 +v 0.062500 0.875000 1.000000 +v 0.062500 0.125000 0.937500 +v 0.062500 0.875000 0.937500 +v 0.062500 0.500000 -0.000000 +v 0.062500 0.562500 -0.000000 +v 0.937500 0.500000 0.000000 +v 0.937500 0.562500 0.000000 +v 0.062500 0.500000 0.062500 +v 0.062500 0.562500 0.062500 +v 0.937500 0.500000 0.062500 +v 0.937500 0.562500 0.062500 +v 1.000000 0.500000 0.062500 +v 1.000000 0.562500 0.062500 +v 1.000000 0.500000 0.937500 +v 1.000000 0.562500 0.937500 +v 0.937500 0.500000 0.062500 +v 0.937500 0.562500 0.062500 +v 0.937500 0.500000 0.937500 +v 0.937500 0.562500 0.937500 +v 0.062500 0.500000 0.062500 +v 0.062500 0.562500 0.062500 +v 0.062500 0.500000 0.937500 +v 0.062500 0.562500 0.937500 +v 0.000000 0.500000 0.062500 +v 0.000000 0.562500 0.062500 +v 0.000000 0.500000 0.937500 +v 0.000000 0.562500 0.937500 +v 0.250000 0.500000 0.937500 +v 0.250000 0.562500 0.937500 +v 0.250000 0.500000 0.062500 +v 0.250000 0.562500 0.062500 +v 0.312500 0.500000 0.937500 +v 0.312500 0.562500 0.937500 +v 0.312500 0.500000 0.062500 +v 0.312500 0.562500 0.062500 +vt 0.0000 0.7812 +vt -0.0000 0.7500 +vt 0.0938 0.7500 +vt 0.0938 0.7812 +vt 0.0000 0.7500 +vt 0.0000 0.7188 +vt 0.0938 0.7188 +vt 0.0938 0.7500 +vt 0.0312 0.7812 +vt 0.0000 0.7812 +vt -0.0000 0.6875 +vt 0.0312 0.6875 +vt 0.0000 0.7188 +vt 0.0938 0.6875 +vt 0.0938 0.7188 +vt 0.0000 0.7812 +vt 0.0000 0.6875 +vt 0.0938 0.6875 +vt 0.0938 0.7812 +vt 0.0938 0.6875 +vt 0.0938 0.7812 +vt 0.0000 0.7812 +vt 0.0312 0.7188 +vt 0.0312 0.6875 +vt 0.0625 0.6875 +vt 0.0625 0.7188 +vt 0.0000 0.7188 +vt 0.0000 0.6875 +vt 0.0312 0.6875 +vt 0.0312 0.7188 +vt 0.0312 0.7500 +vt 0.0312 0.7812 +vt 0.0000 0.7812 +vt 0.0000 0.7500 +vt 0.0625 0.7188 +vt 0.0625 0.6875 +vt 0.0938 0.6875 +vt 0.0938 0.7188 +vt 0.0312 0.7500 +vt 0.0000 0.7500 +vt 0.0312 0.6875 +vt 0.0625 0.6875 +vt 0.0625 0.7500 +vt 0.0312 0.7500 +vt 0.0625 0.6875 +vt 0.0625 0.7188 +vt 0.0000 0.7188 +vt 0.0000 0.6875 +vt 0.0312 0.6875 +vt 0.0312 0.7500 +vt 0.0000 0.7500 +vt 0.0625 0.6875 +vt 0.0938 0.6875 +vt 0.0938 0.7500 +vt 0.0625 0.7500 +vt 0.0312 0.7812 +vt 0.0312 0.7188 +vt 0.0938 0.7188 +vt 0.0938 0.7812 +vt 0.5625 0.6250 +vt 0.5000 0.6250 +vt 0.5000 0.5938 +vt 0.5625 0.5938 +vt 0.5625 0.5312 +vt 0.5000 0.5312 +vt 0.5000 0.5000 +vt 0.5625 0.5000 +vt 0.5625 0.5625 +vt 0.5625 0.5938 +vt 0.5000 0.5938 +vt 0.5000 0.5625 +vt 0.5625 0.5625 +vt 0.5000 0.5625 +vt 0.5000 0.5312 +vt 0.5625 0.5312 +vt 1.0000 0.1875 +vt 1.0000 0.2500 +vt 0.5000 0.2500 +vt 0.5000 0.1875 +vt 1.0000 0.0625 +vt 1.0000 0.1250 +vt 0.5000 0.1250 +vt 0.5000 0.0625 +vt 0.5000 0.0000 +vt 1.0000 -0.0000 +vt 1.0000 0.0625 +vt 0.5000 0.1875 +vt 0.5000 0.1250 +vt 1.0000 0.1250 +vt 1.0000 0.5000 +vt 0.5000 0.5000 +vt 0.5000 0.0000 +vt 1.0000 0.0000 +vt 0.5000 0.5000 +vt 0.0000 0.5000 +vt 0.0000 0.0000 +vt 0.3750 0.5938 +vt 0.0000 0.5938 +vt 0.0000 0.5625 +vt 0.3750 0.5625 +vt 0.3750 0.5312 +vt 0.0000 0.5312 +vt 0.0000 0.5000 +vt 0.3750 0.5000 +vt 0.3750 0.6250 +vt 0.0000 0.6250 +vt -0.0000 0.5938 +vt 0.3750 0.5938 +vt -0.0000 0.5312 +vt 0.3750 0.5312 +vt 0.3750 0.5625 +vt -0.0000 0.5625 +vt 0.0312 0.6250 +vt 0.0312 0.6562 +vt 0.0000 0.6562 +vt 0.0000 0.6250 +vt 0.0000 0.5938 +vt 0.0000 0.5625 +vt 0.4375 0.5625 +vt 0.4375 0.5938 +vt 0.0000 0.5312 +vt 0.0000 0.5000 +vt 0.4375 0.5000 +vt 0.4375 0.5312 +vt -0.0000 0.6250 +vt 0.0000 0.5938 +vt 0.4375 0.5938 +vt 0.4375 0.6250 +vt 0.4375 0.5312 +vt -0.0000 0.5312 +vt 0.5000 0.5625 +vt 0.5000 0.5312 +vt 0.9375 0.5312 +vt 0.9375 0.5625 +vt 0.5000 0.5312 +vt 0.5000 0.5000 +vt 0.9375 0.5000 +vt 0.9375 0.5312 +vt 0.5000 0.6250 +vt 0.5000 0.5938 +vt 0.9375 0.5938 +vt 0.9375 0.6250 +vt 0.9375 0.5625 +vt 0.9375 0.5938 +vt 0.5000 0.5938 +vt 0.5000 0.5625 +vt 0.3750 0.5938 +vt 0.0000 0.5938 +vt 0.0000 0.5625 +vt 0.3750 0.5625 +vt -0.0000 0.5000 +vt 0.3750 0.5000 +vt 0.3750 0.5312 +vt 0.0000 0.5312 +vt 0.3750 0.6250 +vt -0.0000 0.6250 +vt -0.0000 0.5938 +vt 0.3750 0.5938 +vt -0.0000 0.5312 +vt 0.3750 0.5312 +vt 0.3750 0.5625 +vt 0.0000 0.5625 +vt 0.0312 0.6250 +vt 0.0312 0.6562 +vt 0.0000 0.6562 +vt 0.0000 0.6250 +vt 0.3750 0.5938 +vt 0.0000 0.5938 +vt -0.0000 0.5625 +vt 0.3750 0.5625 +vt -0.0000 0.5000 +vt 0.3750 0.5000 +vt 0.3750 0.5312 +vt -0.0000 0.5312 +vt 0.3750 0.6250 +vt 0.0000 0.6250 +vt 0.0000 0.5938 +vt 0.3750 0.5938 +vt -0.0000 0.5312 +vt 0.3750 0.5312 +vt 0.3750 0.5625 +vt -0.0000 0.5625 +vt 0.0312 0.6250 +vt 0.0312 0.6562 +vt 0.0000 0.6562 +vt 0.0000 0.6250 +vt 0.3750 0.5938 +vt 0.0000 0.5938 +vt 0.0000 0.5625 +vt 0.3750 0.5625 +vt 0.3750 0.5312 +vt 0.0000 0.5312 +vt 0.0000 0.5000 +vt 0.3750 0.5000 +vt 0.3750 0.6250 +vt -0.0000 0.6250 +vt 0.0000 0.5938 +vt 0.3750 0.5938 +vt 0.0000 0.5312 +vt 0.3750 0.5312 +vt 0.3750 0.5625 +vt -0.0000 0.5625 +vt 0.0312 0.6250 +vt 0.0312 0.6562 +vt 0.0000 0.6562 +vt 0.0000 0.6250 +vt 0.0000 0.5938 +vt 0.0000 0.5625 +vt 0.4375 0.5625 +vt 0.4375 0.5938 +vt 0.0000 0.5312 +vt 0.0000 0.5000 +vt 0.4375 0.5000 +vt 0.4375 0.5312 +vt -0.0000 0.6250 +vt -0.0000 0.5938 +vt 0.4375 0.5938 +vt 0.4375 0.6250 +vt 0.4375 0.5312 +vt -0.0000 0.5312 +vt 0.0000 0.5938 +vt 0.0000 0.5625 +vt 0.4375 0.5625 +vt 0.4375 0.5938 +vt 0.0000 0.5312 +vt 0.0000 0.5000 +vt 0.4375 0.5000 +vt 0.4375 0.5312 +vt 0.0000 0.6250 +vt 0.0000 0.5938 +vt 0.4375 0.5938 +vt 0.4375 0.6250 +vt 0.4375 0.5312 +vt 0.0000 0.5312 +vt 0.0000 0.5938 +vt 0.0000 0.5625 +vt 0.4375 0.5625 +vt 0.4375 0.5938 +vt 0.0000 0.5312 +vt 0.0000 0.5000 +vt 0.4375 0.5000 +vt 0.4375 0.5312 +vt -0.0000 0.6250 +vt 0.0000 0.5938 +vt 0.4375 0.5938 +vt 0.4375 0.6250 +vt 0.4375 0.5312 +vt 0.0000 0.5312 +vt 0.5000 0.5625 +vt 0.5000 0.5312 +vt 0.9375 0.5312 +vt 0.9375 0.5625 +vt 0.5000 0.5312 +vt 0.5000 0.5000 +vt 0.9375 0.5000 +vt 0.9375 0.5312 +vt 0.5000 0.6250 +vt 0.5000 0.5938 +vt 0.9375 0.5938 +vt 0.9375 0.6250 +vt 0.9375 0.5625 +vt 0.9375 0.5938 +vt 0.5000 0.5938 +vt 0.5000 0.5625 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +s off +f 1/1/1 2/2/1 4/3/1 3/4/1 +f 3/5/2 4/6/2 8/7/2 7/8/2 +f 7/9/3 8/10/3 6/11/3 5/12/3 +f 5/13/4 6/11/4 2/14/4 1/15/4 +f 3/16/5 7/17/5 5/18/5 1/19/5 +f 8/20/6 4/21/6 2/22/6 6/11/6 +f 9/23/1 10/24/1 12/25/1 11/26/1 +f 11/27/2 12/28/2 16/29/2 15/30/2 +f 15/31/3 16/32/3 14/33/3 13/34/3 +f 13/35/4 14/36/4 10/37/4 9/38/4 +f 11/27/5 15/30/5 13/39/5 9/40/5 +f 17/41/1 18/42/1 20/43/1 19/44/1 +f 19/45/2 20/46/2 24/47/2 23/48/2 +f 23/48/3 24/49/3 22/50/3 21/51/3 +f 21/52/4 22/53/4 18/54/4 17/55/4 +f 19/56/5 23/57/5 21/58/5 17/59/5 +f 25/60/1 26/61/1 28/62/1 27/63/1 +f 27/64/2 28/65/2 32/66/2 31/67/2 +f 31/68/3 32/69/3 30/70/3 29/71/3 +f 29/72/4 30/73/4 26/74/4 25/75/4 +f 33/76/1 34/77/1 36/78/1 35/79/1 +f 35/80/2 36/81/2 40/82/2 39/83/2 +f 39/83/3 40/84/3 38/85/3 37/86/3 +f 37/87/4 38/88/4 34/89/4 33/76/4 +f 35/90/5 39/91/5 37/92/5 33/93/5 +f 40/84/6 36/94/6 34/95/6 38/96/6 +f 41/97/1 42/98/1 44/99/1 43/100/1 +f 43/101/2 44/102/2 48/103/2 47/104/2 +f 47/105/3 48/106/3 46/107/3 45/108/3 +f 45/109/4 46/110/4 42/111/4 41/112/4 +f 48/113/6 44/114/6 42/115/6 46/116/6 +f 49/117/2 50/118/2 52/119/2 51/120/2 +f 55/121/4 56/122/4 54/123/4 53/124/4 +f 51/125/5 55/126/5 53/127/5 49/128/5 +f 56/129/6 52/119/6 50/118/6 54/130/6 +f 57/131/2 58/132/2 60/133/2 59/134/2 +f 63/135/4 64/136/4 62/137/4 61/138/4 +f 59/139/5 63/140/5 61/141/5 57/142/5 +f 64/143/6 60/144/6 58/145/6 62/146/6 +f 65/147/1 66/148/1 68/149/1 67/150/1 +f 67/151/2 68/152/2 72/153/2 71/154/2 +f 71/155/3 72/156/3 70/157/3 69/158/3 +f 69/159/4 70/160/4 66/161/4 65/162/4 +f 72/163/6 68/164/6 66/165/6 70/166/6 +f 73/167/1 74/168/1 76/169/1 75/170/1 +f 75/171/2 76/172/2 80/173/2 79/174/2 +f 79/175/3 80/176/3 78/177/3 77/178/3 +f 77/179/4 78/180/4 74/181/4 73/182/4 +f 80/183/6 76/184/6 74/185/6 78/186/6 +f 81/187/1 82/188/1 84/189/1 83/190/1 +f 83/191/2 84/192/2 88/193/2 87/194/2 +f 87/195/3 88/196/3 86/197/3 85/198/3 +f 85/199/4 86/200/4 82/201/4 81/202/4 +f 88/203/6 84/204/6 82/205/6 86/206/6 +f 89/207/2 90/208/2 92/209/2 91/210/2 +f 95/211/4 96/212/4 94/213/4 93/214/4 +f 91/215/5 95/216/5 93/217/5 89/218/5 +f 96/219/6 92/209/6 90/208/6 94/220/6 +f 97/221/3 98/222/3 100/223/3 99/224/3 +f 103/225/1 104/226/1 102/227/1 101/228/1 +f 99/229/5 103/230/5 101/231/5 97/232/5 +f 104/233/6 100/223/6 98/222/6 102/234/6 +f 105/235/3 106/236/3 108/237/3 107/238/3 +f 111/239/1 112/240/1 110/241/1 109/242/1 +f 107/243/5 111/244/5 109/245/5 105/246/5 +f 112/247/6 108/237/6 106/236/6 110/248/6 +f 113/249/1 114/250/1 116/251/1 115/252/1 +f 119/253/3 120/254/3 118/255/3 117/256/3 +f 115/257/5 119/258/5 117/259/5 113/260/5 +f 120/261/6 116/262/6 114/263/6 118/264/6 diff --git a/src/main/resources/assets/industrialwires/textures/blocks/panel_creator.png b/src/main/resources/assets/industrialwires/textures/blocks/panel_creator.png new file mode 100644 index 0000000..c6d0758 Binary files /dev/null and b/src/main/resources/assets/industrialwires/textures/blocks/panel_creator.png differ