From 5fed8383fca2b36e82fdf2d937fe35a555e9c9c0 Mon Sep 17 00:00:00 2001 From: BootyToast Date: Sun, 14 Aug 2016 05:40:08 -0400 Subject: [PATCH] New oil gen texture/model. Top texture not finished. Need canola press,oil and coal generators set up for on/off textures. --- .../mod/blocks/BlockOilGenerator.java | 42 +++++++++ .../blockstates/blockOilGenerator.json | 14 ++- .../models/block/blockOilGenerator.json | 89 ++++++++++++++++++ .../textures/blocks/blockOilGenerator.png | Bin 660 -> 4027 bytes .../blocks/blockOilGenerator.png.mcmeta | 6 ++ 5 files changed, 146 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockOilGenerator.json create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockOilGenerator.png.mcmeta diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java index 7b0c40198..39a8843b8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java @@ -18,7 +18,9 @@ import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; import de.ellpeck.actuallyadditions.mod.tile.TileEntityOilGenerator; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; @@ -27,6 +29,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -35,6 +38,8 @@ import java.util.Random; public class BlockOilGenerator extends BlockContainerBase{ + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 7); + public BlockOilGenerator(String name){ super(Material.ROCK, name); this.setHarvestLevel("pickaxe", 0); @@ -45,6 +50,17 @@ public class BlockOilGenerator extends BlockContainerBase{ } + @Override + public boolean isFullCube(IBlockState state){ + return false; + } + + @Override + public boolean isOpaqueCube(IBlockState state){ + return false; + } + + @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityOilGenerator(); @@ -77,6 +93,26 @@ public class BlockOilGenerator extends BlockContainerBase{ return true; } + @Override + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){ + int rotation = MathHelper.floor_double((double)(player.rotationYaw*4.0F/360.0F)+0.5D) & 3; + + if(rotation == 0){ + world.setBlockState(pos, this.getStateFromMeta(0), 2); + } + if(rotation == 1){ + world.setBlockState(pos, this.getStateFromMeta(3), 2); + } + if(rotation == 2){ + world.setBlockState(pos, this.getStateFromMeta(1), 2); + } + if(rotation == 3){ + world.setBlockState(pos, this.getStateFromMeta(2), 2); + } + + super.onBlockPlacedBy(world, pos, state, player, stack); + } + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.RARE; @@ -87,4 +123,10 @@ public class BlockOilGenerator extends BlockContainerBase{ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } + + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + } diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockOilGenerator.json b/src/main/resources/assets/actuallyadditions/blockstates/blockOilGenerator.json index 03c8d6e46..d8d0648f6 100644 --- a/src/main/resources/assets/actuallyadditions/blockstates/blockOilGenerator.json +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockOilGenerator.json @@ -1,16 +1,20 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_bottom_top", + "model": "actuallyadditions:blockOilGenerator", "textures": { - "side": "actuallyadditions:blocks/blockOilGenerator", - "bottom": "actuallyadditions:blocks/blockOilGeneratorBottom", - "top": "actuallyadditions:blocks/blockOilGeneratorTop" + "particle": "actuallyadditions:blocks/blockOilGenerator" }, "transform": "forge:default-block" }, "variants": { "normal": [{}], - "inventory": [{}] + "inventory": [{}], + "meta": { + "0": { "y" : 0 }, + "1": { "y" : 180 }, + "2": { "y" : 270 }, + "3": { "y" : 90 } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockOilGenerator.json b/src/main/resources/assets/actuallyadditions/models/block/blockOilGenerator.json new file mode 100644 index 000000000..7e0b9cf7b --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockOilGenerator.json @@ -0,0 +1,89 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "0": "actuallyadditions:blocks/blockOilGenerator", + "1": "actuallyadditions:blocks/blockCoalGeneratorSide", + "2": "actuallyadditions:blocks/blockCoalGeneratorTop", + "3": "actuallyadditions:blocks/blockCoalGeneratorBottom" + }, + "elements": [ + { + "name": "Cube", + "from": [ 1.0, 0.0, 1.0 ], + "to": [ 15.0, 15.0, 15.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 16.0 ] }, + "east": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 16.0 ] }, + "south": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 16.0 ] }, + "west": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 16.0 ] }, + "up": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ], "cullface": "up" }, + "down": { "texture": "#3", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } + } + }, + { + "name": "Outline", + "from": [ 0.0, 0.0, 0.0 ], + "to": [ 1.0, 15.0, 1.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 15.0, 1.0, 16.0, 15.0 ] }, + "east": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "south": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "west": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "down": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 0.0, 0.0, 15.0 ], + "to": [ 1.0, 15.0, 16.0 ], + "faces": { + "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "east": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "south": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "west": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "down": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 15.0, 0.0, 15.0 ], + "to": [ 16.0, 15.0, 16.0 ], + "faces": { + "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "east": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "south": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "west": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "down": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 15.0, 0.0, 0.0 ], + "to": [ 16.0, 15.0, 1.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 1.0, 1.0, 15.0 ] }, + "east": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "south": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "west": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "down": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 0.0, 15.0, 0.0 ], + "to": [ 16.0, 16.0, 16.0 ], + "faces": { + "north": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "east": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "south": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "west": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "up": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, + "down": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockOilGenerator.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockOilGenerator.png index d1618801bf5bc1930e2e883401327804a1ae0e97..831f0f8d17262d138e6ebd5f7ed4258942aa5d7c 100644 GIT binary patch literal 4027 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