From d16345db41cd93cc16aaff882ba7385030de8bcc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Sep 2017 17:06:03 -0500 Subject: [PATCH] Why do sideonly methods exist? Fix #2389 --- src/main/java/vazkii/botania/common/block/tile/TilePylon.java | 2 +- .../java/vazkii/botania/common/entity/EntitySignalFlare.java | 2 +- src/main/java/vazkii/botania/common/item/lens/ItemLens.java | 2 +- src/main/java/vazkii/botania/common/item/lens/LensFlare.java | 2 +- .../java/vazkii/botania/common/item/material/ItemPetal.java | 2 +- src/main/resources/META-INF/botania_at.cfg | 2 ++ 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index 0ffc5ee03..0636f5134 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -72,7 +72,7 @@ public class TilePylon extends TileEntity implements ITickable { Block block = world.getBlockState(pos.down()).getBlock(); if(block == ModBlocks.flower || block == ModBlocks.shinyFlower) { - int hex = world.getBlockState(pos.down()).getValue(BotaniaStateProps.COLOR).getColorValue(); + int hex = world.getBlockState(pos.down()).getValue(BotaniaStateProps.COLOR).colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = hex & 0xFF; diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index 1ca037e80..947166077 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -52,7 +52,7 @@ public class EntitySignalFlare extends Entity { int color = getColor(); if(color < 16 && color >= 0) { - int hex = EnumDyeColor.byMetadata(color).getColorValue(); + int hex = EnumDyeColor.byMetadata(color).colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = hex & 0xFF; diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index d9d32017f..9a72f68b7 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -232,7 +232,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens if(storedColor == 16) return Color.HSBtoRGB(Botania.proxy.getWorldElapsedTicks() * 2 % 360 / 360F, 1F, 1F); - return EnumDyeColor.byMetadata(storedColor).getColorValue(); + return EnumDyeColor.byMetadata(storedColor).colorValue; } public static int getStoredColor(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java index bab919ee2..bd72f26ee 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java @@ -54,7 +54,7 @@ public class LensFlare extends Lens { if(storedColor == 16) { hex = Color.HSBtoRGB(tile.getWorld().getTotalWorldTime() * 2 % 360 / 360F, 1F, 1F); } else if(storedColor >= 0) { - hex = EnumDyeColor.byMetadata(storedColor).getColorValue(); + hex = EnumDyeColor.byMetadata(storedColor).colorValue; } float r = ((hex & 0xFF0000) >> 16) / 255F; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java index 22ccce754..2dd484ed4 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -96,6 +96,6 @@ public class ItemPetal extends Item16Colors implements IFlowerComponent { @Override public int getParticleColor(ItemStack stack) { - return EnumDyeColor.byMetadata(stack.getItemDamage()).getColorValue(); + return EnumDyeColor.byMetadata(stack.getItemDamage()).colorValue; } } diff --git a/src/main/resources/META-INF/botania_at.cfg b/src/main/resources/META-INF/botania_at.cfg index 756ba70a5..32ea3d6de 100644 --- a/src/main/resources/META-INF/botania_at.cfg +++ b/src/main/resources/META-INF/botania_at.cfg @@ -47,3 +47,5 @@ public net.minecraft.advancements.CriteriaTriggers func_192118_a(Lnet/minecraft/ public net.minecraft.item.ItemTool field_77862_b # toolMaterial public net.minecraft.client.multiplayer.ClientAdvancementManager field_192803_d # advancementToProgress + +public net.minecraft.item.EnumDyeColor field_193351_w # colorValue