diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index b4951a548..05e195ea1 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -17,6 +17,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.StatCollector; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -25,8 +26,6 @@ import vazkii.botania.client.core.handler.ClientTickHandler; public class ItemBlockPool extends ItemBlockWithMetadataAndName { - private final Random rand = new Random(); - public ItemBlockPool(Block par2Block) { super(par2Block); } @@ -43,7 +42,6 @@ public class ItemBlockPool extends ItemBlockWithMetadataAndName { public int getColorFromItemStack(ItemStack stack, int renderPass) { if (stack.getItemDamage() == PoolVariant.FABULOUS.ordinal() && renderPass == 0) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - time += rand.nextInt(100000); return Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); } else { return 16777215; diff --git a/src/main/resources/assets/botania/blockstates/pool.json b/src/main/resources/assets/botania/blockstates/pool.json index e515b21c9..ea7047149 100644 --- a/src/main/resources/assets/botania/blockstates/pool.json +++ b/src/main/resources/assets/botania/blockstates/pool.json @@ -7,10 +7,10 @@ "variants": { "variant": { "default": { "textures": { "all": "botania:model/poolCopy" } }, - "diluted": { "textures": { "all": "botania:model/poolCopy" } }, + "diluted": { "textures": { "all": "botania:model/dilutedPoolCopy" } }, "creative": { "model": "botania:pool_filled", - "textures": { "all": "botania:model/poolCopy", "liquid": "botania:blocks/manaWater" } + "textures": { "all": "botania:model/infinitePoolCopy", "liquid": "botania:blocks/manaWater" } }, "fabulous": { "model": "botania:pool_tinted", diff --git a/src/main/resources/assets/botania/textures/model/dilutedPoolCopy.png b/src/main/resources/assets/botania/textures/model/dilutedPoolCopy.png new file mode 100644 index 000000000..7eae61d14 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/dilutedPoolCopy.png differ diff --git a/src/main/resources/assets/botania/textures/model/infinitePoolCopy.png b/src/main/resources/assets/botania/textures/model/infinitePoolCopy.png new file mode 100644 index 000000000..7030a3184 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/infinitePoolCopy.png differ