From 9ee02b55adf85d45b0204e5a1fe1d9fd13da0f82 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Dec 2015 23:37:49 -0600 Subject: [PATCH] Fix bifrost rod, gateway core and root model --- .../client/core/handler/ModelHandler.java | 2 ++ .../common/item/rod/ItemRainbowRod.java | 13 ++++++----- .../botania/blockstates/alfheimPortal.json | 22 +++++++++++++++++++ .../assets/botania/blockstates/root.json | 13 +++++++++++ 4 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/alfheimPortal.json create mode 100644 src/main/resources/assets/botania/blockstates/root.json diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index e17e2ef4b..e2047ff57 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -341,6 +341,8 @@ public final class ModelHandler { registerItemModel(ModBlocks.manaDetector); registerItemModel(ModBlocks.manaBomb); registerItemModel(ModBlocks.rfGenerator); + registerItemModel(ModBlocks.alfPortal); + registerItemModel(ModBlocks.root); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 24dc8fd33..674bfcfb7 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -55,7 +55,6 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi double x = par3EntityPlayer.posX; double y = par3EntityPlayer.posY; double z = par3EntityPlayer.posZ; - BlockPos playerPos = new BlockPos(par3EntityPlayer); double lx = 0; double ly = -1; @@ -66,15 +65,17 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi int maxlen = prof ? 160 : 100; int time = prof ? (int) (TIME * 1.6) : TIME; + BlockPos playerPos = new BlockPos((int) x, (int) y, (int) z); while(count < maxlen && (int) lx == (int) x && (int) ly == (int) y && (int) lz == (int) z || count < 4 || par2World.getBlockState(playerPos).getBlock().isAir(par2World, playerPos) || par2World.getBlockState(playerPos).getBlock() == place) { if(y >= 256 || y <= 0) break; for(int i = -2; i < 1; i++) - for(int j = -2; j < 1; j++) - if(par2World.getBlockState(playerPos.add(i, 0, j)).getBlock().isAir(par2World, playerPos.add(i, 0, j)) || par2World.getBlockState(playerPos.add(i, 0, j)).getBlock() == place) { - par2World.setBlockState(playerPos.add(i, 0, j), place.getDefaultState()); - TileBifrost tile = (TileBifrost) par2World.getTileEntity(playerPos.add(i, 0, j)); + for(int j = -2; j < 1; j++) { + BlockPos pos_ = new BlockPos((int) x + i, (int) y, (int) z + j); + if(par2World.getBlockState(pos_).getBlock().isAir(par2World, pos_) || par2World.getBlockState(pos_).getBlock() == place) { + par2World.setBlockState(pos_, place.getDefaultState()); + TileBifrost tile = (TileBifrost) par2World.getTileEntity(pos_); if(tile != null) { for(int k = 0; k < 4; k++) Botania.proxy.sparkleFX(par2World, tile.getPos().getX() + Math.random(), tile.getPos().getY() + Math.random(), tile.getPos().getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); @@ -82,6 +83,8 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi } } + } + lx = x; ly = y; lz = z; diff --git a/src/main/resources/assets/botania/blockstates/alfheimPortal.json b/src/main/resources/assets/botania/blockstates/alfheimPortal.json new file mode 100644 index 000000000..812637c1b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/alfheimPortal.json @@ -0,0 +1,22 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/alfheimPortal0" + }, + "transform": "forge:default-block" + }, + "variants": { + "state": { + "off": {}, + "on_x": { + "textures": { "all": "botania:blocks/alfheimPortal1" } + }, + "on_z": { + "textures": { "all": "botania:blocks/alfheimPortal1" } + } + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/root.json b/src/main/resources/assets/botania/blockstates/root.json new file mode 100644 index 000000000..6bced893d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/root.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/root" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file