From f8abe9d7b1ae35fe0a3b9909076f182cfe4b20e4 Mon Sep 17 00:00:00 2001 From: yrsegal Date: Sat, 30 Jul 2016 00:07:20 -0400 Subject: [PATCH 01/37] initial work on potatoes --- .../render/tile/RenderTileTinyPotato.java | 66 ++++++++++++------- .../common/block/tile/TileTinyPotato.java | 2 +- 2 files changed, 44 insertions(+), 24 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index f5d541407..e7ab878fe 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -42,6 +42,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import javax.annotation.Nonnull; +import java.util.regex.Pattern; public class RenderTileTinyPotato extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TINY_POTATO); @@ -49,6 +50,15 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer Date: Sun, 31 Jul 2016 20:07:49 -0500 Subject: [PATCH 02/37] Prep for debug helper build --- build.properties | 2 +- .../java/vazkii/botania/client/model/SpecialFlowerModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.properties b/build.properties index 66c94f169..016afde88 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Fri Jul 29 18:40:22 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.18.1.2042 +forge_version=12.18.1.2044 mc_version=1.10.2 dir_repo=./ build_number=315 diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 1f9c76a8f..42fd26156 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -210,7 +210,7 @@ public class SpecialFlowerModel implements IModelCustomData { public List getQuads(IBlockState state, EnumFacing face, long rand) { if(state.getBlock() != ModBlocks.specialFlower) return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); - + Botania.LOGGER.info("Getting " + (face == null ? "gen" : face.getName()) + " quads"); IExtendedBlockState extendedState = ((IExtendedBlockState) state); String subtileId = extendedState.getValue(BotaniaStateProps.SUBTILE_ID); From 947a225d23c1a840438254bf933f91033739d797 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 31 Jul 2016 20:55:04 -0500 Subject: [PATCH 03/37] TIL you don't set default values for unlisted properties --- .../vazkii/botania/client/model/SpecialFlowerModel.java | 9 +++------ .../botania/common/block/BlockFloatingSpecialFlower.java | 5 +---- .../java/vazkii/botania/common/block/BlockPlatform.java | 6 +----- .../vazkii/botania/common/block/BlockSpecialFlower.java | 5 ++--- .../common/block/corporea/BlockCorporeaCrystalCube.java | 2 +- .../botania/common/block/decor/BlockFloatingFlower.java | 4 +--- 6 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 42fd26156..325d0bfa2 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -210,16 +210,13 @@ public class SpecialFlowerModel implements IModelCustomData { public List getQuads(IBlockState state, EnumFacing face, long rand) { if(state.getBlock() != ModBlocks.specialFlower) return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); - Botania.LOGGER.info("Getting " + (face == null ? "gen" : face.getName()) + " quads"); IExtendedBlockState extendedState = ((IExtendedBlockState) state); String subtileId = extendedState.getValue(BotaniaStateProps.SUBTILE_ID); IBakedModel ret = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - if(subtileId != null) { // Todo remove - workaround for subtile ID being null? - Optional specialModel = bakedBlockModels.getUnchecked(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); - if(specialModel.isPresent()) - ret = specialModel.get(); - } + Optional specialModel = bakedBlockModels.getUnchecked(subtileId); + if(specialModel.isPresent()) + ret = specialModel.get(); return ret.getQuads(state, face, rand); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index cbf48db81..815a99231 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -64,10 +64,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I GameRegistry.addRecipe(new SpecialFloatingFlowerRecipe()); RecipeSorter.register("botania:floatingSpecialFlower", SpecialFloatingFlowerRecipe.class, Category.SHAPELESS, ""); - setDefaultState(((IExtendedBlockState) blockState.getBaseState()) - .withProperty(BotaniaStateProps.ISLAND_TYPE, IFloatingFlower.IslandType.GRASS) - .withProperty(BotaniaStateProps.SUBTILE_ID, "daybloom") - .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index a369ca59f..3725d77d1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -58,11 +58,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, setHardness(2.0F); setResistance(5.0F); setSoundType(SoundType.WOOD); - setDefaultState(((IExtendedBlockState) blockState.getBaseState()) - .withProperty(BotaniaStateProps.HELD_STATE, null) - .withProperty(BotaniaStateProps.HELD_WORLD, null) - .withProperty(BotaniaStateProps.HELD_POS, null) - .withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 47e96c45c..723966808 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -57,6 +57,7 @@ import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.render.IModelRegister; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; @@ -132,9 +133,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I setSoundType(SoundType.PLANT); setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); - setDefaultState(((IExtendedBlockState) blockState.getBaseState()) - .withProperty(BotaniaStateProps.SUBTILE_ID, "daybloom") - .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY) + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY) ); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index 9b755491f..d9b9976b1 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -49,7 +49,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi super(Material.IRON, LibBlockNames.CORPOREA_CRYSTAL_CUBE); setHardness(5.5F); setSoundType(SoundType.METAL); - setDefaultState(((IExtendedBlockState) blockState.getBaseState()).withProperty(Properties.AnimationProperty, null).withProperty(Properties.StaticProperty, true)); + setDefaultState(blockState.getBaseState().withProperty(Properties.StaticProperty, true)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 59142b4a3..a345e1402 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -82,9 +82,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu setSoundType(SoundType.GROUND); setLightLevel(1F); - setDefaultState(((IExtendedBlockState) blockState.getBaseState()) - .withProperty(BotaniaStateProps.ISLAND_TYPE, IslandType.GRASS) - .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @Nonnull From 6cde8299c4ebbb11762cbc59ddd960489bd5b33c Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Tue, 2 Aug 2016 16:19:29 -0400 Subject: [PATCH 04/37] Modify Elven Trade recipes to allow for recipes with multiple outputs --- .../java/vazkii/botania/api/BotaniaAPI.java | 16 ++++++++-- .../botania/api/recipe/RecipeElvenTrade.java | 10 +++--- .../elventrade/ElvenTradeRecipeWrapper.java | 6 ++-- .../common/block/tile/TileAlfPortal.java | 3 +- .../common/lexicon/page/PageElvenRecipe.java | 30 ++++++++++++++++-- .../textures/gui/elvenTradeOverlay.png | Bin 7321 -> 7110 bytes 6 files changed, 50 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 8cf4d22a6..cee6ca7af 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -495,16 +495,26 @@ public final class BotaniaAPI { /** * Registers a Elven Trade recipe (throw an item in an Alfheim Portal). - * @param output The ItemStack to return. + * @param outputs The ItemStacks to return. * @param inputs The items required, can be ItemStack or ore dictionary entry string. * @return The recipe created. */ - public static RecipeElvenTrade registerElvenTradeRecipe(ItemStack output, Object... inputs) { - RecipeElvenTrade recipe = new RecipeElvenTrade(output, inputs); + public static RecipeElvenTrade registerElvenTradeRecipe(ItemStack[] outputs, Object... inputs) { + RecipeElvenTrade recipe = new RecipeElvenTrade(outputs, inputs); elvenTradeRecipes.add(recipe); return recipe; } + /** + * Registers a Elven Trade recipe (throw an item into an Alfeim Portal). + * @param output The ItemStack to return + * @param inputs The items required, can be an ItemStack or an Ore Dictionary entry string. + * @return The recipe created. + */ + public static RecipeElvenTrade registerElvenTradeRecipe(ItemStack output, Object... inputs) { + return registerElvenTradeRecipe(new ItemStack[]{ output }, inputs); + } + /** * Registers a Brew Recipe (for the Botanical Brewery). * @param brew The brew in to be set in this recipe. diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java index 04e96274d..834d5993f 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java @@ -9,11 +9,11 @@ import java.util.List; public class RecipeElvenTrade { - private final ItemStack output; + private final ImmutableList outputs; private final ImmutableList inputs; - public RecipeElvenTrade(ItemStack output, Object... inputs) { - this.output = output; + public RecipeElvenTrade(ItemStack[] outputs, Object... inputs) { + this.outputs = ImmutableList.copyOf(outputs); ImmutableList.Builder inputsToSet = ImmutableList.builder(); for(Object obj : inputs) { @@ -88,8 +88,8 @@ public class RecipeElvenTrade { return inputs; } - public ItemStack getOutput() { - return output; + public List getOutputs() { + return outputs; } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java index 52bf709ac..b76ac1c6f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java @@ -22,7 +22,7 @@ import java.util.List; public class ElvenTradeRecipeWrapper implements IRecipeWrapper { private final List input; - private final ItemStack output; + private final List outputs; @SuppressWarnings("unchecked") public ElvenTradeRecipeWrapper(RecipeElvenTrade recipe) { @@ -36,7 +36,7 @@ public class ElvenTradeRecipeWrapper implements IRecipeWrapper { } } input = builder.build(); - output = recipe.getOutput(); + outputs = ImmutableList.copyOf(recipe.getOutputs()); } @Override @@ -46,7 +46,7 @@ public class ElvenTradeRecipeWrapper implements IRecipeWrapper { @Override public List getOutputs() { - return ImmutableList.of(output); + return outputs; } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index 25f606725..acb38778b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -222,7 +222,8 @@ public class TileAlfPortal extends TileMod { for(RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes) { if(recipe.matches(stacksIn, false)) { recipe.matches(stacksIn, true); - spawnItem(recipe.getOutput().copy()); + for(ItemStack output : recipe.getOutputs()) + spawnItem(output.copy()); break; } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java index 8f84d67e0..a5ee24418 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -43,7 +43,8 @@ public class PageElvenRecipe extends PageRecipe { @Override public void onPageAdded(LexiconEntry entry, int index) { for(RecipeElvenTrade recipe : recipes) - LexiconRecipeMappings.map(recipe.getOutput(), entry, index); + for(ItemStack output : recipe.getOutputs()) + LexiconRecipeMappings.map(output, entry, index); } @Override @@ -58,7 +59,10 @@ public class PageElvenRecipe extends PageRecipe { ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); GlStateManager.disableBlend(); - renderItemAtGridPos(gui, 3, 1, recipe.getOutput(), false); + List outputs = recipe.getOutputs(); + for(int i = 0; i < outputs.size(); i++) { + renderItemAtOutputPos(gui, i % 2, i / 2, outputs.get(i)); + } List inputs = recipe.getInputs(); int i = 0; @@ -94,6 +98,26 @@ public class PageElvenRecipe extends PageRecipe { renderItem(gui, xPos, yPos, stack1, false); } + @SideOnly(Side.CLIENT) + public void renderItemAtOutputPos(IGuiLexiconEntry gui, int x, int y, ItemStack stack) { + if(stack == null || stack.getItem() == null) + return; + stack = stack.copy(); + + if(stack.getItemDamage() == Short.MAX_VALUE) + stack.setItemDamage(0); + + int xPos = gui.getLeft() + x * 20 + 94; + int yPos = gui.getTop() + y * 20 + 52; + + ItemStack stack1 = stack.copy(); + if (stack1.getItemDamage() == -1) { + stack1.setItemDamage(0); + } + + renderItem(gui, xPos, yPos, stack1, false); + } + @Override @SideOnly(Side.CLIENT) @@ -114,7 +138,7 @@ public class PageElvenRecipe extends PageRecipe { public List getDisplayedRecipes() { ArrayList list = new ArrayList<>(); for(RecipeElvenTrade r : recipes) - list.add(r.getOutput()); + list.addAll(r.getOutputs()); return list; } diff --git a/src/main/resources/assets/botania/textures/gui/elvenTradeOverlay.png b/src/main/resources/assets/botania/textures/gui/elvenTradeOverlay.png index c7479f17a63c873bd4bc2e640a77bcb83671fc1f..8c89f61d8400b3d8131750182774b9ed63e33382 100644 GIT binary patch literal 7110 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 G_5T2rB#bKn From 5e8eaf8c77527797cf70527e5d15da782ba30338 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Tue, 2 Aug 2016 16:34:59 -0400 Subject: [PATCH 05/37] Fix Elven Trade JEI handling for trades with multiple outputs --- .../jei/elventrade/ElvenTradeRecipeCategory.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index c82e17d00..c0c0570a3 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -106,8 +106,11 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { posX += 18; } - recipeLayout.getItemStacks().init(index, false, 93, 41); - recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0)); + for (int i = 0; i < wrapper.getOutputs().size(); i++) { + ItemStack stack = wrapper.getOutputs().get(i); + recipeLayout.getItemStacks().init(index + i, false, 93 + (i % 2 * 20), 41 + (i / 2 * 20)); + recipeLayout.getItemStacks().set(index + i, stack); + } } } From 3a5e78a4c6a7502117794ba5bff913e1dbc74de6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 3 Aug 2016 20:30:33 -0500 Subject: [PATCH 06/37] Build 315 --- build.properties | 8 ++++---- version/1.10.2.txt | 2 +- version/update.json | 7 ++++--- web/versions.ini | 3 ++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build.properties b/build.properties index 016afde88..1fafe8ac4 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Fri Jul 29 18:40:22 CDT 2016 +#Wed Aug 03 20:27:38 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.18.1.2044 -mc_version=1.10.2 dir_repo=./ -build_number=315 +mc_version=1.10.2 +forge_version=12.18.1.2044 +build_number=316 mod_name=Botania diff --git a/version/1.10.2.txt b/version/1.10.2.txt index fefc24502..f936bbdf8 100644 --- a/version/1.10.2.txt +++ b/version/1.10.2.txt @@ -1 +1 @@ -r1.8-314 \ No newline at end of file +r1.8-315 \ No newline at end of file diff --git a/version/update.json b/version/update.json index f492ab079..3472c85be 100644 --- a/version/update.json +++ b/version/update.json @@ -5,7 +5,8 @@ "1.10.2": { "r1.8-312": "See https://github.com/williewillus/Botania/releases/r1.8-312", "r1.8-313": "See https://github.com/williewillus/Botania/releases/r1.8-313", - "r1.8-314": "See https://github.com/williewillus/Botania/releases/r1.8-314" + "r1.8-314": "See https://github.com/williewillus/Botania/releases/r1.8-314", + "r1.8-315": "See https://github.com/williewillus/Botania/releases/r1.8-315" }, "1.9": { "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301", @@ -28,8 +29,8 @@ "promos": { "1.10-latest": "r1.8-311", "1.10-recommended": "r1.8-311", - "1.10.2-latest": "r1.8-314", - "1.10.2-recommended": "r1.8-314", + "1.10.2-latest": "r1.8-315", + "1.10.2-recommended": "r1.8-315", "1.9-latest": "r1.8-305", "1.9-recommended": "r1.8-305", "1.9.4-latest": "r1.8-313", diff --git a/web/versions.ini b/web/versions.ini index 625d470d8..b01956212 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -266,4 +266,5 @@ r1.8-312=1.9.4 r1.8-312=1.10.2 r1.8-313=1.9.4 r1.8-313=1.10.2 -r1.8-314=1.10.2 \ No newline at end of file +r1.8-314=1.10.2 +r1.8-315=1.10.2 \ No newline at end of file From 8eccfad65e65e2bfe7bf3c93b44ffeb5c23bdf38 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 4 Aug 2016 19:54:16 -0500 Subject: [PATCH 07/37] If we can't see the extended state bail. This is not a big deal. CLose #423 --- .../vazkii/botania/client/core/handler/DebugHandler.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java index 86f476971..bb3acc68e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -84,8 +84,12 @@ public final class DebugHandler { state = state.getActualState(world, pos); state = state.getBlock().getExtendedState(state, world, pos); if (state instanceof IExtendedBlockState) { - for (Map.Entry, Optional> e : ((IExtendedBlockState) state).getUnlistedProperties().entrySet()) { - event.getRight().add(e.getKey().getName() + ": " + e.getValue().orNull()); + try { + for (Map.Entry, Optional> e : ((IExtendedBlockState) state).getUnlistedProperties().entrySet()) { + event.getRight().add(TextFormatting.LIGHT_PURPLE + e.getKey().getName() + ": " + TextFormatting.RESET + e.getValue().orNull()); + } + } catch (Throwable t) { + event.getRight().add("Error getting extended state"); } } } From acd5cce7cee8fb7981440984bb4433cd781448ac Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 5 Aug 2016 18:31:44 -0500 Subject: [PATCH 08/37] Fix a bunch of things assuming the player only has main hand. Closes #424 --- .../botania/common/block/BlockAltar.java | 2 +- .../common/block/BlockSparkChanger.java | 2 +- .../common/block/mana/BlockBrewery.java | 2 +- .../common/block/mana/BlockEnchanter.java | 2 +- .../botania/common/block/mana/BlockPrism.java | 2 +- .../common/block/mana/BlockRuneAltar.java | 2 +- .../common/block/mana/BlockSpreader.java | 4 +-- .../common/block/mana/BlockTerraPlate.java | 2 +- .../common/block/tile/TileBrewery.java | 8 +++--- .../common/block/tile/TileRuneAltar.java | 8 +++--- .../botania/common/item/ItemBottledMana.java | 25 +++++++++---------- .../item/equipment/bauble/ItemBauble.java | 18 +++++++------ .../item/equipment/bauble/ItemSwapRing.java | 3 ++- .../item/material/ItemManaResource.java | 2 +- .../common/world/SkyblockWorldEvents.java | 2 +- 15 files changed, 45 insertions(+), 39 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 06832a1cd..2a6205f55 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -179,7 +179,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { } else if(stack != null && stack.getItem() == Items.BUCKET && (tile.hasWater || tile.hasLava) && !Botania.gardenOfGlassLoaded) { ItemStack bucket = tile.hasLava ? new ItemStack(Items.LAVA_BUCKET) : new ItemStack(Items.WATER_BUCKET); if(stack.stackSize == 1) - player.inventory.setInventorySlotContents(player.inventory.currentItem, bucket); + player.setHeldItem(hand, bucket); else { if(!player.inventory.addItemStackToInventory(bucket)) player.dropItem(bucket, false); diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 705b9458d..524e81132 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -119,7 +119,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { pstack.stackSize--; if(pstack.stackSize == 0) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.setHeldItem(hand, null); return true; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index dba0c5684..6af9a2c67 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -93,7 +93,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { InventoryHelper.withdrawFromInventory(brew, player); } else { if(stack != null) - return brew.addItem(player, stack); + return brew.addItem(player, stack, hand); } return false; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 9ccc259bd..936c8a790 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -117,7 +117,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, if(enchanter.itemToEnchant == null) { if(stackEnchantable) { enchanter.itemToEnchant = stack.copy(); - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.setHeldItem(hand, null); enchanter.sync(); } } else if(enchanter.stage == TileEnchanter.State.IDLE) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index fe37c587f..14a2cd9bf 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -122,7 +122,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, if(lens == null && isHeldItemLens) { if(!player.capabilities.isCreativeMode) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.setHeldItem(hand, null); prism.getItemHandler().setStackInSlot(0, heldItem.copy()); prism.markDirty(); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 54d0a258b..246a0a43a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -83,7 +83,7 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable altar.trySetLastRecipe(player); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(altar); } else if(stack != null) { - boolean result = altar.addItem(player, stack); + boolean result = altar.addItem(player, stack, hand); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(altar); return result; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index dd1f0e617..d1cc52fd5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -158,7 +158,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex if(lens == null && isHeldItemLens) { if (!player.capabilities.isCreativeMode) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.setHeldItem(hand, null); spreader.getItemHandler().setStackInSlot(0, heldItem.copy()); spreader.markDirty(); @@ -174,7 +174,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex spreader.paddingColor = heldItem.getItemDamage(); heldItem.stackSize--; if(heldItem.stackSize == 0) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.setHeldItem(hand, null); } else if(heldItem == null && spreader.paddingColor != -1 && lens == null) { ItemStack pad = new ItemStack(Blocks.WOOL, 1, spreader.paddingColor); if(!player.inventory.addItemStackToInventory(pad)) diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index 61a7702cb..d78dbe3e4 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -58,7 +58,7 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { if(player == null || !player.capabilities.isCreativeMode) { stack.stackSize--; if(stack.stackSize == 0 && player != null) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.setHeldItem(hand, null); } ItemStack target = stack.copy(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 2aa7bb2ef..843cd329d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -16,6 +16,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.BotaniaAPI; @@ -31,6 +32,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.awt.*; import java.util.List; @@ -44,7 +46,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { int manaLastTick = 0; public int signal = 0; - public boolean addItem(EntityPlayer player, ItemStack stack) { + public boolean addItem(@Nullable EntityPlayer player, ItemStack stack, @Nullable EnumHand hand) { if(recipe != null || stack == null || stack.getItem() instanceof IBrewItem && ((IBrewItem) stack.getItem()).getBrew(stack) != null && ((IBrewItem) stack.getItem()).getBrew(stack) != BotaniaAPI.fallbackBrew || itemHandler.getStackInSlot(0) == null != stack.getItem() instanceof IBrewContainer) return false; @@ -60,7 +62,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { if(player == null || !player.capabilities.isCreativeMode) { stack.stackSize--; if(stack.stackSize == 0 && player != null) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.setHeldItem(hand, null); } break; @@ -99,7 +101,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { for(EntityItem item : items) if(!item.isDead && item.getEntityItem() != null) { ItemStack stack = item.getEntityItem(); - if(addItem(null, stack) && stack.stackSize == 0) + if(addItem(null, stack, null) && stack.stackSize == 0) item.setDead(); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 5c43bca0e..28c74142a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -19,6 +19,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import org.lwjgl.opengl.GL11; @@ -35,6 +36,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; @@ -53,7 +55,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver List lastRecipe = null; int recipeKeepTicks = 0; - public boolean addItem(EntityPlayer player, ItemStack stack) { + public boolean addItem(@Nullable EntityPlayer player, ItemStack stack, @Nullable EnumHand hand) { if(cooldown > 0 || stack.getItem() == ModItems.twigWand || stack.getItem() == ModItems.lexicon) return false; @@ -61,7 +63,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver if(player == null || !player.capabilities.isCreativeMode) { stack.stackSize--; if(stack.stackSize == 0 && player != null) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.setHeldItem(hand, null); } EntityItem item = new EntityItem(worldObj, getPos().getX() + 0.5, getPos().getY() + 1, getPos().getZ() + 0.5, new ItemStack(ModBlocks.livingrock)); @@ -111,7 +113,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver for(EntityItem item : items) if(!item.isDead && item.getEntityItem() != null && item.getEntityItem().getItem() != Item.getItemFromBlock(ModBlocks.livingrock)) { ItemStack stack = item.getEntityItem(); - if(addItem(null, stack) && stack.stackSize == 0) + if(addItem(null, stack, null) && stack.stackSize == 0) item.setDead(); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index ab9843edb..53efb1b10 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 27, 2014, 2:41:19 AM (GMT)] */ package vazkii.botania.common.item; @@ -54,7 +54,7 @@ public class ItemBottledMana extends ItemMod { setMaxDamage(6); } - public void effect(EntityLivingBase living, int id) { + public void effect(ItemStack stack, EntityLivingBase living, int id) { switch(id) { case 0 : { // Random motion living.motionX = (Math.random() - 0.5) * 3; @@ -98,13 +98,14 @@ public class ItemBottledMana extends ItemMod { case 7 : { // All your inventory is belong to us if(!living.worldObj.isRemote && living instanceof EntityPlayer) { EntityPlayer player = ((EntityPlayer) living); - for(int i = 0; i < player.inventory.getSizeInventory(); i++) - if(i != player.inventory.currentItem) { - ItemStack stackAt = player.inventory.getStackInSlot(i); + for(int i = 0; i < player.inventory.getSizeInventory(); i++) { + ItemStack stackAt = player.inventory.getStackInSlot(i); + if(stackAt != stack) { if(stackAt != null) player.entityDropItem(stackAt, 0); player.inventory.setInventorySlotContents(i, null); } + } } break; @@ -189,15 +190,13 @@ public class ItemBottledMana extends ItemMod { } @Override - public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) { - getSeed(par1ItemStack); + public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) {} + + private void randomEffect(EntityLivingBase player, ItemStack stack) { + effect(stack, player, new Random(getSeed(stack)).nextInt(16)); } - public void randomEffect(EntityLivingBase player, ItemStack stack) { - effect(player, new Random(getSeed(stack)).nextInt(16)); - } - - long getSeed(ItemStack stack) { + private long getSeed(ItemStack stack) { long seed = ItemNBTHelper.getLong(stack, TAG_SEED, -1); if(seed == -1) return randomSeed(stack); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index f8be37bb8..9fb29ce70 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -57,20 +57,22 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(!EntityDoppleganger.isTruePlayer(player)) - return ActionResult.newResult(EnumActionResult.FAIL, par1ItemStack); + return ActionResult.newResult(EnumActionResult.FAIL, stack); - if(canEquip(par1ItemStack, player)) { + ItemStack toEquip = stack.copy(); + toEquip.stackSize = 1; + + if(canEquip(toEquip, player)) { InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); for(int i = 0; i < baubles.getSizeInventory(); i++) { - if(baubles.isItemValidForSlot(i, par1ItemStack)) { + if(baubles.isItemValidForSlot(i, toEquip)) { ItemStack stackInSlot = baubles.getStackInSlot(i); if(stackInSlot == null || ((IBauble) stackInSlot.getItem()).canUnequip(stackInSlot, player)) { if(!world.isRemote) { - baubles.setInventorySlotContents(i, par1ItemStack.copy()); - if(!player.capabilities.isCreativeMode) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + baubles.setInventorySlotContents(i, toEquip); + stack.stackSize--; } if(stackInSlot != null) { @@ -83,7 +85,7 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt } } - return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.PASS, stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java index cc66e59f2..a1f3d0974 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java @@ -16,6 +16,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.item.ISortableTool.ToolType; @@ -78,7 +79,7 @@ public class ItemSwapRing extends ItemBauble { } if(bestSlot != -1) { - player.inventory.setInventorySlotContents(player.inventory.currentItem, bestTool); + player.setHeldItem(EnumHand.MAIN_HAND, bestTool); player.inventory.setInventorySlotContents(bestSlot, currentStack); } } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 78508fdd7..9e0ef431b 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -78,7 +78,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve stack.stackSize--; if(stack.stackSize == 0) - event.getEntityPlayer().inventory.setInventorySlotContents(event.getEntityPlayer().inventory.currentItem, null); + event.getEntityPlayer().setHeldItem(event.getHand(), null); event.getWorld().playSound(null, event.getPos(), SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.5F, 1F); event.setCanceled(true); diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index b1eb6d825..caab50865 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -92,7 +92,7 @@ public final class SkyblockWorldEvents { --equipped.stackSize; if(equipped.stackSize <= 0) - event.getEntityPlayer().inventory.setInventorySlotContents(event.getEntityPlayer().inventory.currentItem, new ItemStack(ModItems.waterBowl)); + event.getEntityPlayer().setHeldItem(event.getHand(), new ItemStack(ModItems.waterBowl)); else event.getEntityPlayer().dropItem(new ItemStack(ModItems.waterBowl), false); } } From a0aac5a9bf2c1520902d25118051d6004c43810a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 5 Aug 2016 18:36:04 -0500 Subject: [PATCH 09/37] Stupid compile derp --- .../java/vazkii/botania/common/item/ItemBottledMana.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 53efb1b10..534a5d7ca 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -180,9 +180,9 @@ public class ItemBottledMana extends ItemMod { case 15 : { // Drop own Head if(!living.worldObj.isRemote && living instanceof EntityPlayer) { living.attackEntityFrom(DamageSource.magic, living.getHealth() - 1); - ItemStack stack = new ItemStack(Items.SKULL, 1, 3); - ItemNBTHelper.setString(stack, "SkullOwner", living.getName()); - living.entityDropItem(stack, 0); + ItemStack skull = new ItemStack(Items.SKULL, 1, 3); + ItemNBTHelper.setString(skull, "SkullOwner", living.getName()); + living.entityDropItem(skull, 0); } break; } From 3d7c9e8b945de497cc86ab2d66625f95c76053f1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 5 Aug 2016 20:21:50 -0500 Subject: [PATCH 10/37] Update forge, remove some unneeded particle methods --- build.properties | 2 +- .../common/block/BlockSpecialFlower.java | 39 ------------------ .../block/decor/BlockFloatingFlower.java | 41 ------------------- 3 files changed, 1 insertion(+), 81 deletions(-) diff --git a/build.properties b/build.properties index 1fafe8ac4..066331106 100644 --- a/build.properties +++ b/build.properties @@ -4,6 +4,6 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ mc_version=1.10.2 -forge_version=12.18.1.2044 +forge_version=12.18.1.2046 build_number=316 mod_name=Botania diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 723966808..7c0f54500 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block; -import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.SoundType; import net.minecraft.block.properties.IProperty; @@ -18,8 +17,6 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.particle.ParticleManager; -import net.minecraft.client.particle.ParticleDigging; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -32,11 +29,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -346,40 +341,6 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I ((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc, res); } - @Override - public boolean addLandingEffects(IBlockState state, net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles) { - float f = (float) MathHelper.ceiling_float_int(entity.fallDistance - 3.0F); - double d0 = (double)Math.min(0.2F + f / 15.0F, 10.0F); - if (d0 > 2.5D) { - d0 = 2.5D; - } - int i = (int)(150.0D * d0); - worldObj.spawnParticle(EnumParticleTypes.BLOCK_DUST, entity.posX, entity.posY, entity.posZ, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D, Block.getStateId(Blocks.WATERLILY.getDefaultState())); - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, BlockPos pos, ParticleManager effectRenderer) { - if (world.getBlockState(pos).getBlock() == this) { - int i = 4; - ParticleDigging.Factory factory = new ParticleDigging.Factory(); - for (int j = 0; j < i; ++j) { - for (int k = 0; k < i; ++k) { - for (int l = 0; l < i; ++l) { - double d0 = (double)pos.getX() + ((double)j + 0.5D) / (double)i; - double d1 = (double)pos.getY() + ((double)k + 0.5D) / (double)i; - double d2 = (double)pos.getZ() + ((double)l + 0.5D) / (double)i; - effectRenderer.addEffect(factory.getEntityFX(-1, world, d0, d1, d2, d0 - (double)pos.getX() - 0.5D, d1 - (double)pos.getY() - 0.5D, d2 - (double)pos.getZ() - 0.5D, Block.getStateId(Blocks.WATERLILY.getDefaultState()))); - } - } - } - return true; - } else { - return false; - } - } - @Override public void register() { GameRegistry.register(this); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index a345e1402..bdbaff08f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -10,19 +10,14 @@ */ package vazkii.botania.common.block.decor; -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.particle.ParticleManager; -import net.minecraft.client.particle.ParticleDigging; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; @@ -31,10 +26,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; @@ -130,40 +123,6 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu return state; } - @Override - public boolean addLandingEffects(IBlockState state, net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles) { - float f = (float) MathHelper.ceiling_float_int(entity.fallDistance - 3.0F); - double d0 = (double)Math.min(0.2F + f / 15.0F, 10.0F); - if (d0 > 2.5D) { - d0 = 2.5D; - } - int i = (int)(150.0D * d0); - worldObj.spawnParticle(EnumParticleTypes.BLOCK_DUST, entity.posX, entity.posY, entity.posZ, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D, Block.getStateId(Blocks.DIRT.getDefaultState())); - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, BlockPos pos, ParticleManager effectRenderer) { - if (world.getBlockState(pos).getBlock() == this) { - int i = 4; - ParticleDigging.Factory factory = new ParticleDigging.Factory(); - for (int j = 0; j < i; ++j) { - for (int k = 0; k < i; ++k) { - for (int l = 0; l < i; ++l) { - double d0 = (double)pos.getX() + ((double)j + 0.5D) / (double)i; - double d1 = (double)pos.getY() + ((double)k + 0.5D) / (double)i; - double d2 = (double)pos.getZ() + ((double)l + 0.5D) / (double)i; - effectRenderer.addEffect(factory.getEntityFX(-1, world, d0, d1, d2, d0 - (double)pos.getX() - 0.5D, d1 - (double)pos.getY() - 0.5D, d2 - (double)pos.getZ() - 0.5D, Block.getStateId(Blocks.DIRT.getDefaultState()))); - } - } - } - return true; - } else { - return false; - } - } - @Override public void registerItemForm() { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); From c3e4a028252818408005bbb3f4bb306f2683b5d5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 5 Aug 2016 20:51:21 -0500 Subject: [PATCH 11/37] A few inconsequential cleanups --- .../subtile/functional/SubTileBubbell.java | 21 +++++++-------- .../functional/SubTileSpectranthemum.java | 2 +- .../common/block/tile/TileLightRelay.java | 2 +- .../common/core/helper/MathHelper.java | 4 --- .../common/item/ItemObedienceStick.java | 27 +++++++++---------- .../botania/common/item/lens/LensMagnet.java | 2 +- 6 files changed, 24 insertions(+), 34 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java index 173aefa6c..4447776d2 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java @@ -50,19 +50,16 @@ public class SubTileBubbell extends SubTileFunctional { if(ticksExisted % 10 == 0 && range < getRange()) range++; - for(int i = -range; i < range + 1; i++) - for(int j = -range; j < range + 1; j++) - for(int k = -range; k < range + 1; k++) { - BlockPos pos = supertile.getPos().add(i, j, k); - if(MathHelper.pointDistanceSpace(i, j, k, 0, 0, 0) < range) { - IBlockState state = supertile.getWorld().getBlockState(pos); - if(state.getMaterial() == Material.WATER) { - supertile.getWorld().setBlockState(pos, ModBlocks.fakeAir.getDefaultState(), 2); - TileFakeAir air = (TileFakeAir) supertile.getWorld().getTileEntity(pos); - air.setFlower(supertile); - } - } + for(BlockPos pos : BlockPos.getAllInBoxMutable(getPos().add(-range, -range, -range), getPos().add(range, range, range))) { + if(getPos().distanceSq(pos) < range * range) { + IBlockState state = supertile.getWorld().getBlockState(pos); + if(state.getMaterial() == Material.WATER) { + supertile.getWorld().setBlockState(pos, ModBlocks.fakeAir.getDefaultState(), 2); + TileFakeAir air = (TileFakeAir) supertile.getWorld().getTileEntity(pos); + air.setFlower(supertile); } + } + } } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index b906047ab..70a14decd 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -141,7 +141,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { boolean bound = super.bindTo(player, wand, pos, side); - if(!bound && !pos.equals(bindPos) && MathHelper.pointDistanceSpace(pos, supertile.getPos()) <= BIND_RANGE && !(pos.equals(supertile.getPos()))) { + if(!bound && !pos.equals(bindPos) && pos.distanceSq(supertile.getPos()) <= BIND_RANGE * BIND_RANGE && !(pos.equals(supertile.getPos()))) { bindPos = pos; sync(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index d36e77cde..94d0df5e7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -160,7 +160,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { @Override public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { - if(player.worldObj.getBlockState(pos).getBlock() != ModBlocks.lightRelay || MathHelper.pointDistanceSpace(pos, getPos()) > MAX_DIST) + if(player.worldObj.getBlockState(pos).getBlock() != ModBlocks.lightRelay || pos.distanceSq(getPos()) > MAX_DIST * MAX_DIST) return false; bindPos = pos; diff --git a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java index e2c92f72b..f7f7a1474 100644 --- a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java @@ -52,10 +52,6 @@ public final class MathHelper { return ret; } - public static float pointDistanceSpace(BlockPos p1, BlockPos p2) { - return pointDistanceSpace(p1.getX(), p1.getY(), p1.getZ(), p2.getX(), p2.getY(), p2.getZ()); - } - public static float pointDistanceSpace(double x1, double y1, double z1, double x2, double y2, double z2) { return (float) Math.sqrt((x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2) + (z1 - z2) * (z1 - z2)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java index 11e17b6cf..5b27380d5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java +++ b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java @@ -46,23 +46,20 @@ public class ItemObedienceStick extends ItemMod { Actuator act = pool ? Actuator.functionalActuator : Actuator.generatingActuator; int range = pool ? SubTileFunctional.LINK_RANGE : SubTileGenerating.LINK_RANGE; - for(int i = -range; i < range + 1; i++) - for(int j = -range; j < range + 1; j++) - for(int k = -range; k < range + 1; k++) { - BlockPos pos_ = pos.add(i, j, k); - if(MathHelper.pointDistanceSpace(pos_, pos) > range) - continue; + for(BlockPos pos_ : BlockPos.getAllInBox(pos.add(-range, -range, -range), pos.add(range, range, range))) { + if(pos_.distanceSq(pos) > range * range) + continue; - TileEntity tile = world.getTileEntity(pos_); - if(tile instanceof ISubTileContainer) { - SubTileEntity subtile = ((ISubTileContainer) tile).getSubTile(); - if(act.actuate(subtile, tileAt)) { - Vector3 orig = new Vector3(pos_.getX() + 0.5, pos_.getY() + 0.5, pos_.getZ() + 0.5); - Vector3 end = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - ItemTwigWand.doParticleBeam(world, orig, end); - } - } + TileEntity tile = world.getTileEntity(pos_); + if(tile instanceof ISubTileContainer) { + SubTileEntity subtile = ((ISubTileContainer) tile).getSubTile(); + if(act.actuate(subtile, tileAt)) { + Vector3 orig = new Vector3(pos_.getX() + 0.5, pos_.getY() + 0.5, pos_.getZ() + 0.5); + Vector3 end = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); + ItemTwigWand.doParticleBeam(world, orig, end); } + } + } if(player.worldObj.isRemote) player.swingArm(hand); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java index fefd9a71d..dc1071e9f 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java @@ -49,7 +49,7 @@ public class LensMagnet extends Lens { BlockPos srcCoords = burst.getBurstSourceBlockPos(); - if(MathHelper.pointDistanceSpace(tile.getPos(), srcCoords) > 3 && receiver.canRecieveManaFromBursts() && !receiver.isFull()) { + if(tile.getPos().distanceSq(srcCoords) > 9 && receiver.canRecieveManaFromBursts() && !receiver.isFull()) { Vector3 burstVec = Vector3.fromEntity(entity); Vector3 tileVec = Vector3.fromTileEntityCenter(tile).add(0, -0.1, 0); Vector3 motionVec = new Vector3(entity.motionX, entity.motionY, entity.motionZ); From 921825aca3878157f7897a97e3d490b672f9be50 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 5 Aug 2016 20:59:05 -0500 Subject: [PATCH 12/37] Fix pickup delay not getting set properly in thrown items --- .../vazkii/botania/common/entity/EntityThrownItem.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 73caba59a..4210251b8 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -40,7 +40,7 @@ public class EntityThrownItem extends EntityItem { pickupDelay = (int) MethodHandles.pickupDelay_getter.invokeExact(item); } catch (Throwable ignored) {} - item.setPickupDelay(pickupDelay); + setPickupDelay(pickupDelay); motionX = item.motionX; motionY = item.motionY; motionZ = item.motionZ; @@ -63,12 +63,10 @@ public class EntityThrownItem extends EntityItem { if (!worldObj.isRemote) { Entity entity = null; - List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX*2, motionY*2, motionZ*2).expand(2.0D, 2.0D, 2.0D)); + List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX*2, motionY*2, motionZ*2).expand(2.0D, 2.0D, 2.0D)); double d0 = 0.0D; - for (Object aList : list) { - Entity entity1 = (Entity) aList; - + for (Entity entity1 : list) { int pickupDelay; try { pickupDelay = (int) MethodHandles.pickupDelay_getter.invokeExact(this); From aeaa2a76c426b862391eff7ef7cd9f0b934980e1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 6 Aug 2016 11:48:01 -0500 Subject: [PATCH 13/37] Tweak black hole talisman interactions, fix a crash --- .../common/item/ItemBlackHoleTalisman.java | 60 ++++++++++--------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index e5a13ee01..98ab43385 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -69,55 +69,58 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { - if(getBlock(par1ItemStack) != Blocks.AIR && player.isSneaking()) { - int dmg = par1ItemStack.getItemDamage(); - par1ItemStack.setItemDamage(~dmg & 1); + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + if(getBlock(stack) != Blocks.AIR && player.isSneaking()) { + int dmg = stack.getItemDamage(); + stack.setItemDamage(~dmg & 1); player.playSound(SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, 0.3F, 0.1F); - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.PASS, stack); } @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { IBlockState state = world.getBlockState(pos); - boolean set = setBlock(stack, state.getBlock(), state.getBlock().getMetaFromState(state)); - if(!set) { + if (Item.getItemFromBlock(state.getBlock()) != null + && setBlock(stack, state.getBlock(), state.getBlock().getMetaFromState(state))) { + return EnumActionResult.SUCCESS; + } else { Block bBlock = getBlock(stack); int bmeta = getBlockMeta(stack); + if(bBlock == null) + return EnumActionResult.PASS; + TileEntity tile = world.getTileEntity(pos); if(tile != null && tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side)) { - IItemHandler inv = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side); - ItemStack toAdd = new ItemStack(bBlock, 1, bmeta); - int maxSize = toAdd.getMaxStackSize(); - toAdd.stackSize = remove(stack, maxSize); - ItemStack remainder = ItemHandlerHelper.insertItemStacked(inv, toAdd, false); - if(remainder != null) - add(stack, remainder.stackSize); + if(!world.isRemote) { + IItemHandler inv = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side); + ItemStack toAdd = new ItemStack(bBlock, 1, bmeta); + int maxSize = toAdd.getMaxStackSize(); + toAdd.stackSize = remove(stack, maxSize); + ItemStack remainder = ItemHandlerHelper.insertItemStacked(inv, toAdd, false); + if(remainder != null) + add(stack, remainder.stackSize); + } + return EnumActionResult.SUCCESS; } else { - int entities = world.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(pos.offset(side), pos.offset(side).add(1, 1, 1))).size(); - BlockPos correctedPos = bBlock.isReplaceable(world, pos) ? pos : pos.offset(side); + if(player.capabilities.isCreativeMode || getBlockCount(stack) > 0) { + ItemStack toUse = new ItemStack(bBlock, 1, bmeta); - if(entities == 0 && !(correctedPos.getY() < 0) && !(correctedPos.getY() >= 256)) { - int remove = player.capabilities.isCreativeMode ? 1 : remove(stack, 1); - if(remove > 0) { - ItemStack toUse = new ItemStack(bBlock, 1, bmeta); + if (Item.getItemFromBlock(bBlock).onItemUse(toUse, player, world, pos, hand, side, hitX, hitY, hitZ) == EnumActionResult.SUCCESS) { + remove(stack, 1); ItemsRemainingRenderHandler.set(toUse, getBlockCount(stack)); - - Item.getItemFromBlock(bBlock).onItemUse(toUse, player, world, pos, hand, side, hitX, hitY, hitZ); - set = true; + return EnumActionResult.SUCCESS; } } } } - player.setItemStackToSlot(hand == EnumHand.MAIN_HAND ? EntityEquipmentSlot.MAINHAND : EntityEquipmentSlot.OFFHAND, stack); - return set ? EnumActionResult.SUCCESS : EnumActionResult.PASS; + return EnumActionResult.PASS; } @Override @@ -210,7 +213,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } private boolean setBlock(ItemStack stack, Block block, int meta) { - if(getBlock(stack) == Blocks.AIR || getBlockCount(stack) == 0) { + if(Item.getItemFromBlock(block) != null && (getBlock(stack) == Blocks.AIR || getBlockCount(stack) == 0)) { ItemNBTHelper.setString(stack, TAG_BLOCK_NAME, Block.REGISTRY.getNameForObject(block).toString()); ItemNBTHelper.setInt(stack, TAG_BLOCK_META, meta); return true; @@ -257,8 +260,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } public static Block getBlock(ItemStack stack) { - Block block = Block.getBlockFromName(getBlockName(stack)); - return block; + return Block.getBlockFromName(getBlockName(stack)); } public static int getBlockMeta(ItemStack stack) { From 16615ce4299e1d145e1a9a917d97dc2e9636e24f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 6 Aug 2016 12:04:18 -0500 Subject: [PATCH 14/37] Tweak cacophonium interactions --- .../botania/common/item/ItemCacophonium.java | 89 ++++++++++--------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 09e34fb91..1737d3632 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -36,6 +36,9 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.apache.logging.log4j.core.helpers.Strings; +import vazkii.botania.api.sound.BotaniaSoundEvents; +import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.ModBlocks; @@ -45,13 +48,14 @@ import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.lang.reflect.InvocationTargetException; import java.util.List; public class ItemCacophonium extends ItemMod implements ICraftAchievement { private static final String TAG_SOUND = "sound"; private static final String TAG_SOUND_NAME = "soundName"; - private static final String TAG_HAS_SOUND = "hasSound"; public ItemCacophonium() { super(LibItemNames.CACOPHONIUM); @@ -62,32 +66,33 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) { if(entity instanceof EntityLiving) { EntityLiving living = (EntityLiving) entity; - SoundEvent sound; - try { - if(living instanceof EntityCreeper) - sound = SoundEvents.ENTITY_CREEPER_PRIMED; - else if(living instanceof EntitySlime) - sound = ((EntitySlime) living).isSmallSlime() ? SoundEvents.ENTITY_SMALL_SLIME_SQUISH : SoundEvents.ENTITY_SLIME_SQUISH; - else sound = (SoundEvent) ReflectionHelper.findMethod(EntityLiving.class, living, LibObfuscation.GET_LIVING_SOUND).invoke(living); + SoundEvent sound = null; - if(sound != null) { - String s = EntityList.getEntityString(entity); - if(s == null) - s = "generic"; - - ItemNBTHelper.setString(stack, TAG_SOUND, sound.getRegistryName().toString()); - ItemNBTHelper.setString(stack, TAG_SOUND_NAME, "entity." + s + ".name"); - ItemNBTHelper.setBoolean(stack, TAG_HAS_SOUND, true); - player.setHeldItem(hand, stack); - //player.inventory.setInventorySlotContents(player.inventory.currentItem, stack.copy()); - - if(player.worldObj.isRemote) - player.swingArm(hand); - - return true; + if(living instanceof EntityCreeper) + sound = SoundEvents.ENTITY_CREEPER_PRIMED; + else if(living instanceof EntitySlime) + sound = ((EntitySlime) living).isSmallSlime() ? SoundEvents.ENTITY_SMALL_SLIME_SQUISH : SoundEvents.ENTITY_SLIME_SQUISH; + else { + try { + sound = (SoundEvent) ReflectionHelper.findMethod(EntityLiving.class, living, LibObfuscation.GET_LIVING_SOUND).invoke(living); + } catch (InvocationTargetException | IllegalAccessException ignored) { + Botania.LOGGER.debug("Couldn't get living sound"); } - } catch (Exception e) { - e.printStackTrace(); + } + + if(sound != null) { + String s = EntityList.getEntityString(entity); + if(s == null) + s = "generic"; + + ItemNBTHelper.setString(stack, TAG_SOUND, sound.getRegistryName().toString()); + ItemNBTHelper.setString(stack, TAG_SOUND_NAME, "entity." + s + ".name"); + player.setHeldItem(hand, stack); + + if(player.worldObj.isRemote) + player.swingArm(hand); + + return true; } } @@ -97,15 +102,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { - boolean can = isDOIT(stack); - if(!can) { - String sound = ItemNBTHelper.getString(stack, TAG_SOUND, ""); - isDOIT(stack); - if(sound != null && !sound.isEmpty()) - can = true; - } - - if(can) { + if(getSound(stack) != null) { Block block = world.getBlockState(pos).getBlock(); if(block == Blocks.NOTEBLOCK) { world.setBlockState(pos, ModBlocks.cacophonium.getDefaultState()); @@ -123,7 +120,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { if(isDOIT(stack)) list.add(I18n.format("botaniamisc.justDoIt")); - else if(ItemNBTHelper.getBoolean(stack, TAG_HAS_SOUND, false)) + else if(getSound(stack) != null) list.add(I18n.format(ItemNBTHelper.getString(stack, TAG_SOUND_NAME, ""))); } @@ -140,10 +137,10 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { - if(ItemNBTHelper.getBoolean(par1ItemStack, TAG_HAS_SOUND, false) || isDOIT(par1ItemStack)) + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + if(getSound(stack) != null) player.setActiveHand(hand); - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } @Override @@ -156,13 +153,17 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { if(stack == null) return; - String sound = ItemNBTHelper.getString(stack, TAG_SOUND, ""); - boolean doit = isDOIT(stack); - if(doit) - sound = "botania:doit"; + SoundEvent sound = getSound(stack); - if(sound != null && !sound.isEmpty() && SoundEvent.REGISTRY.containsKey(new ResourceLocation(sound))) - world.playSound(null, x, y, z, SoundEvent.REGISTRY.getObject(new ResourceLocation(sound)), category, volume, doit ? 1F : (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F + 1.0F); + if(sound != null) + world.playSound(null, x, y, z, sound, category, volume, sound == BotaniaSoundEvents.doit ? 1F : (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F + 1.0F); + } + + @Nullable + private static SoundEvent getSound(ItemStack stack) { + if(isDOIT(stack)) + return BotaniaSoundEvents.doit; + else return SoundEvent.REGISTRY.getObject(new ResourceLocation(ItemNBTHelper.getString(stack, TAG_SOUND, ""))); } private static boolean isDOIT(ItemStack stack) { From ddda9db4acb20d65ae8849226d443d5e375f9853 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 7 Aug 2016 12:00:52 -0500 Subject: [PATCH 15/37] Make bubbell less laggy --- src/main/java/vazkii/botania/common/block/BlockFakeAir.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 396c5a61e..56a622914 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -36,7 +36,7 @@ public class BlockFakeAir extends BlockMod { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 0, 0, 0); public BlockFakeAir() { - super(Material.AIR, LibBlockNames.FAKE_AIR); + super(Material.STRUCTURE_VOID, LibBlockNames.FAKE_AIR); setTickRandomly(true); } @@ -68,7 +68,7 @@ public class BlockFakeAir extends BlockMod { @Override public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { if(shouldRemove(world, pos)) - world.setBlockState(pos, Blocks.WATER.getDefaultState()); + world.setBlockState(pos, rand.nextInt(10) == 0 ? Blocks.WATER.getDefaultState() : Blocks.AIR.getDefaultState()); } @Override From 90c42b25c730d7a1b2780efc01176dffd2676d0f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 7 Aug 2016 12:27:01 -0500 Subject: [PATCH 16/37] Get rid of some triple nested for loops --- .../subtile/functional/SubTileExoflame.java | 80 +++++++++---------- .../functional/SubTileMarimorphosis.java | 13 ++- .../subtile/functional/SubTileOrechid.java | 13 ++- .../functional/SubTileRannuncarpus.java | 19 +++-- .../subtile/generating/SubTileMunchdew.java | 30 +++---- .../botania/common/item/ItemGrassHorn.java | 20 ++--- .../botania/common/item/ItemGrassSeeds.java | 17 +--- .../common/item/rod/ItemDiviningRod.java | 30 +++---- 8 files changed, 95 insertions(+), 127 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java index 322dc877e..f2cd743c9 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java @@ -39,51 +39,45 @@ public class SubTileExoflame extends SubTileFunctional { boolean did = false; - fireFurnaces : { - for(int i = -RANGE; i < RANGE + 1; i++) - for(int j = -RANGE_Y; j < RANGE_Y + 1; j++) - for(int k = -RANGE; k < RANGE + 1; k++) { - BlockPos pos = supertile.getPos().add(i, j, k); - - TileEntity tile = supertile.getWorld().getTileEntity(pos); - Block block = supertile.getWorld().getBlockState(pos).getBlock(); - if(tile != null) { - if(tile instanceof TileEntityFurnace && (block == Blocks.FURNACE || block == Blocks.LIT_FURNACE)) { - TileEntityFurnace furnace = (TileEntityFurnace) tile; - boolean canSmelt = canFurnaceSmelt(furnace); - if(canSmelt && mana > 2) { - if(furnace.getField(0) < 2) { // Field 0 -> Burn time - if(furnace.getField(0) == 0) - BlockFurnace.setState(true, supertile.getWorld(), pos); - furnace.setField(0, 200); - mana = Math.max(0, mana - COST); - } - if(ticksExisted % 2 == 0) - furnace.setField(2, Math.min(199, furnace.getField(2) + 1)); // Field 2 -> cook time - - did = true; - - if(mana <= 0) - break fireFurnaces; - } - } else if(tile instanceof IExoflameHeatable) { - IExoflameHeatable heatable = (IExoflameHeatable) tile; - - if(heatable.canSmelt() && mana > 2) { - if(heatable.getBurnTime() == 0) { - heatable.boostBurnTime(); - mana = Math.max(0, mana - COST); - } - - if(ticksExisted % 2 == 0) - heatable.boostCookTime(); - - if(mana <= 0) - break fireFurnaces; - } - } + for(BlockPos pos : BlockPos.getAllInBox(getPos().add(-RANGE, -RANGE_Y, -RANGE), getPos().add(RANGE, RANGE_Y, RANGE))) { + TileEntity tile = supertile.getWorld().getTileEntity(pos); + Block block = supertile.getWorld().getBlockState(pos).getBlock(); + if(tile != null) { + if(tile instanceof TileEntityFurnace && (block == Blocks.FURNACE || block == Blocks.LIT_FURNACE)) { + TileEntityFurnace furnace = (TileEntityFurnace) tile; + boolean canSmelt = canFurnaceSmelt(furnace); + if(canSmelt && mana > 2) { + if(furnace.getField(0) < 2) { // Field 0 -> Burn time + if(furnace.getField(0) == 0) + BlockFurnace.setState(true, supertile.getWorld(), pos); + furnace.setField(0, 200); + mana = Math.max(0, mana - COST); } + if(ticksExisted % 2 == 0) + furnace.setField(2, Math.min(199, furnace.getField(2) + 1)); // Field 2 -> cook time + + did = true; + + if(mana <= 0) + break; } + } else if(tile instanceof IExoflameHeatable) { + IExoflameHeatable heatable = (IExoflameHeatable) tile; + + if(heatable.canSmelt() && mana > 2) { + if(heatable.getBurnTime() == 0) { + heatable.boostBurnTime(); + mana = Math.max(0, mana - COST); + } + + if(ticksExisted % 2 == 0) + heatable.boostCookTime(); + + if(mana <= 0) + break; + } + } + } } if(did) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java index ae2334e13..a9bd252d9 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java @@ -96,14 +96,11 @@ public class SubTileMarimorphosis extends SubTileFunctional { int range = getRange(); int rangeY = getRangeY(); - for(int i = -range; i < range + 1; i++) - for(int j = -rangeY; j < rangeY; j++) - for(int k = -range; k < range + 1; k++) { - BlockPos pos = supertile.getPos().add(i, j, k); - IBlockState state = supertile.getWorld().getBlockState(pos); - if(state.getBlock().isReplaceableOreGen(state, supertile.getWorld(), pos, BlockStateMatcher.forBlock(Blocks.STONE))) - possibleCoords.add(pos); - } + for(BlockPos pos : BlockPos.getAllInBox(getPos().add(-range, -rangeY, -range), getPos().add(range, rangeY, range))) { + IBlockState state = supertile.getWorld().getBlockState(pos); + if(state.getBlock().isReplaceableOreGen(state, supertile.getWorld(), pos, BlockStateMatcher.forBlock(Blocks.STONE))) + possibleCoords.add(pos); + } if(possibleCoords.isEmpty()) return null; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java index 44ce95006..c71e5888f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java @@ -103,14 +103,11 @@ public class SubTileOrechid extends SubTileFunctional { List possibleCoords = new ArrayList<>(); Block source = getSourceBlock(); - for(int i = -RANGE; i < RANGE + 1; i++) - for(int j = -RANGE_Y; j < RANGE_Y; j++) - for(int k = -RANGE; k < RANGE + 1; k++) { - BlockPos pos = supertile.getPos().add(i, j, k); - IBlockState state = supertile.getWorld().getBlockState(pos); - if(state.getBlock().isReplaceableOreGen(state, supertile.getWorld(), pos, BlockStateMatcher.forBlock(source))) - possibleCoords.add(pos); - } + for(BlockPos pos : BlockPos.getAllInBox(getPos().add(-RANGE, -RANGE_Y, -RANGE), getPos().add(RANGE, RANGE_Y, RANGE))) { + IBlockState state = supertile.getWorld().getBlockState(pos); + if(state.getBlock().isReplaceableOreGen(state, supertile.getWorld(), pos, BlockStateMatcher.forBlock(source))) + possibleCoords.add(pos); + } if(possibleCoords.isEmpty()) return null; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index 43b6bba5e..4e8220288 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -93,16 +93,15 @@ public class SubTileRannuncarpus extends SubTileFunctional { Item stackItem = stack.getItem(); if(stackItem instanceof ItemBlock || stackItem instanceof ItemBlockSpecial || stackItem instanceof ItemRedstone || stackItem instanceof IFlowerPlaceable) { if(!scanned) { - for(int i = -rangePlace; i < rangePlace + 1; i++) - for(int j = -rangePlaceY; j < rangePlaceY + 1; j++) - for(int l = -rangePlace; l < rangePlace + 1; l++) { - BlockPos pos_ = pos.add(i, j, l); - IBlockState stateAbove = supertile.getWorld().getBlockState(pos_.up()); - Block blockAbove = stateAbove.getBlock(); - - if(filter == supertile.getWorld().getBlockState(pos_) && (blockAbove.isAir(stateAbove, supertile.getWorld(), pos_.up()) || blockAbove.isReplaceable(supertile.getWorld(), pos_.up()))) - validPositions.add(pos_.up()); - } + for(BlockPos pos_ : BlockPos.getAllInBox(pos.add(-rangePlace, -rangePlaceY, -rangePlace), pos.add(rangePlace, rangePlaceY, rangePlace))) { + IBlockState stateAbove = supertile.getWorld().getBlockState(pos_.up()); + Block blockAbove = stateAbove.getBlock(); + BlockPos up = pos_.up(); + if(filter == supertile.getWorld().getBlockState(pos_) + && (blockAbove.isAir(stateAbove, supertile.getWorld(), up) + || blockAbove.isReplaceable(supertile.getWorld(), up))) + validPositions.add(up); + } scanned = true; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java index 6e6f476b1..312ae7522 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java @@ -58,26 +58,22 @@ public class SubTileMunchdew extends SubTileGenerating { List coords = new ArrayList<>(); BlockPos pos = supertile.getPos(); - for(int i = -RANGE; i < RANGE + 1; i++) - for(int j = 0; j < RANGE_Y; j++) - for(int k = -RANGE; k < RANGE + 1; k++) { - BlockPos pos_ = pos.add(i, j, k); - if(supertile.getWorld().getBlockState(pos_).getMaterial() == Material.LEAVES) { - boolean exposed = false; - for(EnumFacing dir : EnumFacing.VALUES) { - IBlockState offState = supertile.getWorld().getBlockState(pos_.offset(dir)); - if(offState.getBlock().isAir(offState, supertile.getWorld(), pos_.offset(dir))) { - exposed = true; - break; - } - } - - - if(exposed) - coords.add(pos_); + for(BlockPos pos_ : BlockPos.getAllInBox(pos.add(-RANGE, -RANGE_Y, -RANGE), pos.add(RANGE, RANGE_Y, RANGE))) { + if(supertile.getWorld().getBlockState(pos_).getMaterial() == Material.LEAVES) { + boolean exposed = false; + for(EnumFacing dir : EnumFacing.VALUES) { + IBlockState offState = supertile.getWorld().getBlockState(pos_.offset(dir)); + if(offState.getBlock().isAir(offState, supertile.getWorld(), pos_.offset(dir))) { + exposed = true; + break; } } + if(exposed) + coords.add(pos_); + } + } + if(coords.isEmpty()) break eatLeaves; diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index f1767a650..7d2bd265b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -112,24 +112,24 @@ public class ItemGrassHorn extends ItemMod { int rangeY = 3 + stackDmg * 4; List coords = new ArrayList<>(); - for(int i = -range; i < range + 1; i++) - for(int j = -range; j < range + 1; j++) - for(int k = -rangeY; k < rangeY + 1; k++) { - BlockPos pos = srcPos.add(i, k, j); - Block block = world.getBlockState(pos).getBlock(); - if(block instanceof IHornHarvestable ? ((IHornHarvestable) block).canHornHarvest(world, pos, stack, type) : stackDmg == 0 && block instanceof BlockBush && !(block instanceof ISpecialFlower) || stackDmg == 1 && block.isLeaves(world.getBlockState(pos), world, pos) || stackDmg == 2 && block == Blocks.SNOW_LAYER) - coords.add(pos); - } + for(BlockPos pos : BlockPos.getAllInBox(srcPos.add(-range, -rangeY, -range), srcPos.add(range, rangeY, range))) { + Block block = world.getBlockState(pos).getBlock(); + if(block instanceof IHornHarvestable + ? ((IHornHarvestable) block).canHornHarvest(world, pos, stack, type) + : stackDmg == 0 && block instanceof BlockBush && !(block instanceof ISpecialFlower) + || stackDmg == 1 && block.isLeaves(world.getBlockState(pos), world, pos) + || stackDmg == 2 && block == Blocks.SNOW_LAYER) + coords.add(pos); + } Collections.shuffle(coords, rand); int count = Math.min(coords.size(), 32 + stackDmg * 16); for(int i = 0; i < count; i++) { BlockPos currCoords = coords.get(i); - List items = new ArrayList<>(); IBlockState state = world.getBlockState(currCoords); Block block = state.getBlock(); - items.addAll(block.getDrops(world, currCoords, state, 0)); + List items = block.getDrops(world, currCoords, state, 0); if(block instanceof IHornHarvestable && ((IHornHarvestable) block).hasSpecialHornHarvest(world, currCoords, stack, type)) ((IHornHarvestable) block).harvestByHorn(world, currCoords, stack, type); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 64ec96613..ba039dd56 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -279,21 +279,10 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { * should be removed. */ public boolean tick() { - ++ticksExisted; - - // Go through all blocks in the specified RANGE, and then - // try and spread around that block if it is our target block already - for(int i = -RANGE; i <= RANGE; i++) { - for(int j = -RANGE; j <= RANGE; j++) { - BlockPos pos = startCoords.add(i, 0, j); - IBlockState state = world.getBlockState(pos); - - if(state == stateToSet) { - // Only make changes every 20 ticks - if(ticksExisted % 20 != 0) continue; - + if(++ticksExisted % 20 == 0) { + for(BlockPos pos : BlockPos.getAllInBox(startCoords.add(-RANGE, 0, -RANGE), startCoords.add(RANGE, 0, RANGE))) { + if(world.getBlockState(pos) == stateToSet) tickBlock(pos); - } } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index 7bb64d6e6..532908adb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -66,24 +66,20 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW public void doHighlight(World world, BlockPos pos, int range, long seedxor) { Botania.proxy.setWispFXDepthTest(false); - for(int i = -range; i < range + 1; i++) - for(int j = -range; j < range + 1; j++) - for(int k = -range; k < range + 1; k++) { - BlockPos pos_ = pos.add(i, j, k); - IBlockState state = world.getBlockState(pos_); - if (Item.getItemFromBlock(state.getBlock()) == null) { - continue; - } - ItemStack orestack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)); - for(int id : OreDictionary.getOreIDs(orestack)) { - String s = OreDictionary.getOreName(id); - if(s.matches("^ore[A-Z].+")) { - Random rand = new Random(s.hashCode() ^ seedxor); - Botania.proxy.wispFX(world, pos_.getX() + world.rand.nextFloat(), pos_.getY() + world.rand.nextFloat(), pos_.getZ() + world.rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), 0.25F, 0F, 8); - break; - } - } + for(BlockPos pos_ : BlockPos.getAllInBox(pos.add(-range, -range, -range), pos.add(range, range, range))) { + IBlockState state = world.getBlockState(pos_); + if(Item.getItemFromBlock(state.getBlock()) == null) + continue; + ItemStack orestack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)); + for(int id : OreDictionary.getOreIDs(orestack)) { + String s = OreDictionary.getOreName(id); + if(s.matches("^ore[A-Z].+")) { + Random rand = new Random(s.hashCode() ^ seedxor); + Botania.proxy.wispFX(world, pos_.getX() + world.rand.nextFloat(), pos_.getY() + world.rand.nextFloat(), pos_.getZ() + world.rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), 0.25F, 0F, 8); + break; } + } + } Botania.proxy.setWispFXDepthTest(true); } From 8423607b29f9a6a980eb64bd2b897b1377c1df8c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 7 Aug 2016 18:30:31 -0500 Subject: [PATCH 17/37] Reinstate null subtile check. Closes #428 --- .../vazkii/botania/client/model/SpecialFlowerModel.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 325d0bfa2..f382459c1 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -192,15 +192,16 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public Optional load(@Nonnull String key) { - if (key == null) Botania.LOGGER.error("Null passed to special model cacheloader?!"); Map, ModelResourceLocation> loadFrom = loadBlocks ? blockModels : itemModels; ModelResourceLocation loc = loadFrom.get(Optional.of(key)); if(loc == null) return Optional.empty(); + IModel model = ModelLoaderRegistry.getModelOrMissing(loc); if(model == ModelLoaderRegistry.getMissingModel()) return Optional.empty(); + return Optional.of(model.bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter())); } } @@ -210,11 +211,12 @@ public class SpecialFlowerModel implements IModelCustomData { public List getQuads(IBlockState state, EnumFacing face, long rand) { if(state.getBlock() != ModBlocks.specialFlower) return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); + IExtendedBlockState extendedState = ((IExtendedBlockState) state); String subtileId = extendedState.getValue(BotaniaStateProps.SUBTILE_ID); IBakedModel ret = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - Optional specialModel = bakedBlockModels.getUnchecked(subtileId); + Optional specialModel = bakedBlockModels.getUnchecked(subtileId == null ? "" : subtileId); if(specialModel.isPresent()) ret = specialModel.get(); From a3e8d88f1cbe6900ac8d4e4ab3a2c759de2c1dfb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 7 Aug 2016 20:10:44 -0500 Subject: [PATCH 18/37] Fix a corproea animation being absent --- .../render/entity/RenderCorporeaSpark.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java index 599140677..59ac6f867 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -10,11 +10,18 @@ */ package vazkii.botania.client.render.entity; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.network.datasync.DataParameter; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.entity.EntityCorporeaSpark; public class RenderCorporeaSpark extends RenderSparkBase { @@ -48,7 +55,6 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public void renderCallback(EntityCorporeaSpark entity, float pticks) { -/* int time = entity.getItemDisplayTicks(); if(time == 0) return; @@ -64,14 +70,12 @@ public class RenderCorporeaSpark extends RenderSparkBase { GlStateManager.color(1F, 1F, 1F, absTime / 10); GlStateManager.translate(0F, 0F, -2F + (time < 0 ? -absTime : absTime) / 6); - ItemStack stack = entity.getDisplayedItem(); + ItemStack stack = entity.getDisplayedItem().orNull(); if(stack == null) return; - Item item = stack.getItem(); - boolean block = item instanceof ItemBlock; - Minecraft.getMinecraft().renderEngine.bindTexture(block ? TextureMap.LOCATION_BLOCKS_TEXTURE : TextureMap.locationItemsTexture); - IIcon icon = block ? Block.getBlockFromItem(item).getBlockTextureFromSide(ForgeDirection.UP.ordinal()) : item.getIcon(stack, 0); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + TextureAtlasSprite icon = Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(stack, entity.worldObj, null).getParticleTexture(); if(icon != null) { float minU = icon.getMinU(); @@ -91,7 +95,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { GlStateManager.translate(gap * i, 0F, 0F); for(int j = -shift; j < shift; j++) { GlStateManager.translate(0F, gap * j, 0F); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), minU + stepU * (i + shift), minV + stepV * (j + shift + 1), minU + stepU * (i + shift + 1), minV + stepV * (j + shift), icon.getIconWidth() / pieces, icon.getIconHeight() / pieces, 1F / 8F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), minU + stepU * (i + shift), minV + stepV * (j + shift + 1), minU + stepU * (i + shift + 1), minV + stepV * (j + shift), icon.getIconWidth() / pieces, icon.getIconHeight() / pieces, 1F / 8F); GlStateManager.translate(0F, -gap * j, 0F); } GlStateManager.translate(-gap * i, 0F, 0F); @@ -100,7 +104,6 @@ public class RenderCorporeaSpark extends RenderSparkBase { GlStateManager.disableBlend(); GlStateManager.popMatrix(); -*/ } } From 0b34fe71931b93668a8e25b050ac9fdeff563c37 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 8 Aug 2016 20:17:22 -0500 Subject: [PATCH 19/37] Fix porting derp in flare lens. Closes #429 --- .../botania/common/item/lens/LensFlare.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) 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 8809624db..c6a2bd87a 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java @@ -16,6 +16,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.MathHelper; import vazkii.botania.api.mana.IManaSpreader; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.tile.mana.TileSpreader; import java.awt.*; @@ -48,22 +49,20 @@ public class LensFlare extends Lens { float my = (float) (MathHelper.sin(rotationPitch / 180.0F * (float) Math.PI) * f / 2D); int storedColor = ItemLens.getStoredColor(stack); - float r = 1, g = 1, b = 1; + int hex = -1; TileEntity tile = (TileEntity) spreader; if(storedColor == 16) { - Color c = Color.getHSBColor(tile.getWorld().getTotalWorldTime() * 2 % 360 / 360F, 1F, 1F); - r = c.getRed() / 255F; - g = c.getGreen() / 255F; - b = c.getBlue() / 255F; + hex = Color.HSBtoRGB(tile.getWorld().getTotalWorldTime() * 2 % 360 / 360F, 1F, 1F); } else if(storedColor >= 0) { - int hex = EnumDyeColor.byMetadata(storedColor).getMapColor().colorValue; - r = (hex & 0xFF0000) >> 16; - g = (hex & 0xFF00) >> 8; - b = (hex & 0xFF); + hex = EnumDyeColor.byMetadata(storedColor).getMapColor().colorValue; } - Botania.proxy.wispFX(tile.getWorld(), tile.getPos().getX() + 0.5, tile.getPos().getY() + 0.5, tile.getPos().getZ() + 0.5, r / 255F, g / 255F, b / 255F, 0.4F, mx, my, mz); + float r = ((hex & 0xFF0000) >> 16) / 255F; + float g = ((hex & 0xFF00) >> 8) / 255F; + float b = (hex & 0xFF) / 255F; + + Botania.proxy.wispFX(tile.getWorld(), tile.getPos().getX() + 0.5, tile.getPos().getY() + 0.5, tile.getPos().getZ() + 0.5, r, g, b, 0.4F, mx, my, mz); } } From 32a28e83a5263a0709e9954685544b6ea4cdf707 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 9 Aug 2016 19:48:54 -0500 Subject: [PATCH 20/37] Magic flowers now show properly in JEI. Closes #431 --- .../botania/client/integration/jei/JEIBotaniaPlugin.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index cc6c64b00..662c0ff3f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -14,6 +14,7 @@ import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; import mezz.jei.api.recipe.VanillaRecipeCategoryUid; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.state.enums.AltarVariant; @@ -44,6 +45,9 @@ public class JEIBotaniaPlugin implements IModPlugin { public void register(@Nonnull IModRegistry registry) { IJeiHelpers jeiHelpers = registry.getJeiHelpers(); + jeiHelpers.getSubtypeRegistry().registerNbtInterpreter(Item.getItemFromBlock(ModBlocks.specialFlower), ItemBlockSpecialFlower::getType); + jeiHelpers.getSubtypeRegistry().registerNbtInterpreter(Item.getItemFromBlock(ModBlocks.floatingSpecialFlower), ItemBlockSpecialFlower::getType); + registry.addRecipeCategories( new BreweryRecipeCategory(jeiHelpers.getGuiHelper()), new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()), From 8d9996cb6bcc838c4e213acb46542e244b9c49c2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 9 Aug 2016 19:57:41 -0500 Subject: [PATCH 21/37] Fix corporea retainer comparator output not working. Closes #430 --- .../common/block/tile/corporea/TileCorporeaRetainer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index b80e561e7..22013761e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -47,7 +47,7 @@ public class TileCorporeaRetainer extends TileMod { this.request = request; this.requestCount = requestCount; pendingRequest = true; - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + worldObj.updateComparatorOutputLevel(getPos(), worldObj.getBlockState(getPos()).getBlock()); } public boolean hasPendingRequest() { @@ -65,7 +65,7 @@ public class TileCorporeaRetainer extends TileMod { ICorporeaRequestor requestor = (ICorporeaRequestor) inv.world.getTileEntity(inv.pos); requestor.doCorporeaRequest(request, requestCount, spark); pendingRequest = false; - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + worldObj.updateComparatorOutputLevel(getPos(), worldObj.getBlockState(getPos()).getBlock()); } } } From 07f68b37da9ad3a246b95c042cd6c10bd91698d1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 9 Aug 2016 21:04:09 -0500 Subject: [PATCH 22/37] Fix missing sideonly --- .../vazkii/botania/common/block/tile/TileSpecialFlower.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java index 167cacc4d..893b8aba7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -25,6 +25,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.ISubTileSlowableContainer; @@ -165,6 +167,7 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil return list; } + @SideOnly(Side.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { if(subTile != null) subTile.renderHUD(mc, res); From 348b52eb9faeea114335215a9d23396de68403d6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 11 Aug 2016 19:50:01 -0500 Subject: [PATCH 23/37] Fix some of the easier potatoes --- .../render/tile/RenderTileTinyPotato.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index e7ab878fe..1809564a7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -42,7 +42,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import javax.annotation.Nonnull; -import java.util.regex.Pattern; public class RenderTileTinyPotato extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TINY_POTATO); @@ -188,19 +187,19 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer Date: Thu, 11 Aug 2016 20:38:54 -0500 Subject: [PATCH 24/37] Bunch more potato fixes, and one for me! --- .../render/tile/RenderTileTinyPotato.java | 55 ++++++++++--------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 1809564a7..d24aa4503 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -170,7 +170,8 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer Date: Thu, 11 Aug 2016 21:00:04 -0500 Subject: [PATCH 25/37] Don't spam quite so many stacks --- .../render/tile/RenderTileTinyPotato.java | 28 +++++++++++-------- .../equipment/bauble/ItemBaubleCosmetic.java | 2 +- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index d24aa4503..78a481100 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -39,15 +39,18 @@ import vazkii.botania.client.model.ModelTinyPotato; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileTinyPotato; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import javax.annotation.Nonnull; +import java.util.Arrays; public class RenderTileTinyPotato extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TINY_POTATO); private static final ResourceLocation textureGrayscale = new ResourceLocation(LibResources.MODEL_TINY_POTATO_GS); private static final ResourceLocation textureHalloween = new ResourceLocation(LibResources.MODEL_TINY_POTATO_HALLOWEEN); private static final ModelTinyPotato model = new ModelTinyPotato(); + private final ItemStack[] cosmetics = Arrays.stream(ItemBaubleCosmetic.Variants.values()).map(v -> new ItemStack(ModItems.cosmetic, 1, v.ordinal())).toArray(ItemStack[]::new); private static boolean matches(String name, String match) { @@ -172,13 +175,13 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer Date: Fri, 12 Aug 2016 21:41:27 -0500 Subject: [PATCH 26/37] Fix all other potatoes. Closes #409 --- .../render/tile/RenderTileTinyPotato.java | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 78a481100..9ad0fcc22 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -180,7 +180,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer Date: Fri, 12 Aug 2016 22:17:12 -0500 Subject: [PATCH 27/37] Fix weird model name clash. Closes #436 --- src/main/java/vazkii/botania/common/lib/LibItemNames.java | 2 +- src/main/resources/assets/botania/lang/en_US.lang | 2 +- src/main/resources/assets/botania/lang/es_ES.lang | 2 +- src/main/resources/assets/botania/lang/fr_FR.lang | 2 +- src/main/resources/assets/botania/lang/ja_JP.lang | 2 +- src/main/resources/assets/botania/lang/ko_KR.lang | 2 +- src/main/resources/assets/botania/lang/nl_NL.lang | 2 +- src/main/resources/assets/botania/lang/pt_BR.lang | 2 +- src/main/resources/assets/botania/lang/zh_CN.lang | 2 +- src/main/resources/assets/botania/lang/zh_TW.lang | 2 +- .../assets/botania/models/item/{root.json => livingRoot.json} | 0 11 files changed, 10 insertions(+), 10 deletions(-) rename src/main/resources/assets/botania/models/item/{root.json => livingRoot.json} (100%) diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 98f2643f7..5d6927462 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -208,7 +208,7 @@ public final class LibItemNames { "manasteelNugget", "terrasteelNugget", "elementiumNugget", - "root", + "livingRoot", "pebble", "manaweaveCloth", "manaPowder" diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 905d3716a..ad1ce0a2d 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1588,7 +1588,7 @@ item.botania:terraAxe.name=Terra Truncator item.botania:manasteelNugget.name=Manasteel Nugget item.botania:terrasteelNugget.name=Terrasteel Nugget item.botania:elementiumNugget.name=Elementium Nugget -item.botania:root.name=Living Root +item.botania:livingRoot.name=Living Root item.botania:pebble.name=Pebble item.botania:waterBowl.name=Bowl of Water item.botania:obedienceStick.name=Floral Obedience Stick diff --git a/src/main/resources/assets/botania/lang/es_ES.lang b/src/main/resources/assets/botania/lang/es_ES.lang index fb1b313db..cd8d93f2a 100644 --- a/src/main/resources/assets/botania/lang/es_ES.lang +++ b/src/main/resources/assets/botania/lang/es_ES.lang @@ -1336,7 +1336,7 @@ item.botania:terraAxe.name=Truncador de Terra item.botania:manasteelNugget.name=Pepita de manacero item.botania:terrasteelNugget.name=Pepita de terracero item.botania:elementiumNugget.name=Pepita de elementio -item.botania:root.name=Raíz viviente +item.botania:livingRoot.name=Raíz viviente item.botania:pebble.name=Guijarro item.botania:waterBowl.name=Cuenco con agua item.botania:obedienceStick.name=Palo de obediencia floral diff --git a/src/main/resources/assets/botania/lang/fr_FR.lang b/src/main/resources/assets/botania/lang/fr_FR.lang index 2d49a91e6..7605cbd41 100644 --- a/src/main/resources/assets/botania/lang/fr_FR.lang +++ b/src/main/resources/assets/botania/lang/fr_FR.lang @@ -1196,7 +1196,7 @@ item.botania:terraAxe.name=Troncateur Terra item.botania:manasteelNugget.name=Pépite de manacier item.botania:terrasteelNugget.name=Pépite de terracier item.botania:elementiumNugget.name=Pépite d'élémentium -item.botania:root.name=Racine vivante +item.botania:livingRoot.name=Racine vivante item.botania:pebble.name=Caillou item.botania:waterBowl.name=bol d'eau item.botania:obedienceStick.name=Bâton d'obéissance floral diff --git a/src/main/resources/assets/botania/lang/ja_JP.lang b/src/main/resources/assets/botania/lang/ja_JP.lang index fc6f9c561..bf4a1b933 100644 --- a/src/main/resources/assets/botania/lang/ja_JP.lang +++ b/src/main/resources/assets/botania/lang/ja_JP.lang @@ -1352,7 +1352,7 @@ item.botania:terraAxe.name=テラトランケーター item.botania:manasteelNugget.name=マナスチールのナゲット item.botania:terrasteelNugget.name=テラスチールのナゲット item.botania:elementiumNugget.name=エレメンチウムのナゲット -item.botania:root.name=リビングルート +item.botania:livingRoot.name=リビングルート item.botania:pebble.name=小石 item.botania:waterBowl.name=水の入ったボウル item.botania:obedienceStick.name=花の指揮棒 diff --git a/src/main/resources/assets/botania/lang/ko_KR.lang b/src/main/resources/assets/botania/lang/ko_KR.lang index 258ce220a..a6ddd8074 100644 --- a/src/main/resources/assets/botania/lang/ko_KR.lang +++ b/src/main/resources/assets/botania/lang/ko_KR.lang @@ -1298,7 +1298,7 @@ item.botania:terraAxe.name=대지 절단 item.botania:manasteelNugget.name=마나합금 조각 item.botania:terrasteelNugget.name=테라스틸 조각 item.botania:elementiumNugget.name=엘레멘티움 조각 -item.botania:root.name=생명의 뿌리 +item.botania:livingRoot.name=생명의 뿌리 item.botania:pebble.name=옥석 item.botania:waterBowl.name=물이 담긴 그릇 item.botania:obedienceStick.name=꽃의 순종막대 diff --git a/src/main/resources/assets/botania/lang/nl_NL.lang b/src/main/resources/assets/botania/lang/nl_NL.lang index cb5563a04..65d0b5b66 100644 --- a/src/main/resources/assets/botania/lang/nl_NL.lang +++ b/src/main/resources/assets/botania/lang/nl_NL.lang @@ -1431,7 +1431,7 @@ item.botania:terraAxe.name=Terrakapper item.botania:manasteelNugget.name=Klompje Manastaal item.botania:terrasteelNugget.name=Klompje Terrastaal item.botania:elementiumNugget.name=Klompje Elementium -item.botania:root.name=Levenswortel +item.botania:livingRoot.name=Levenswortel item.botania:pebble.name=Kiezel item.botania:waterBowl.name=Kom Water item.botania:obedienceStick.name=Bloemen Gehoorzaamheidsstok diff --git a/src/main/resources/assets/botania/lang/pt_BR.lang b/src/main/resources/assets/botania/lang/pt_BR.lang index 625e7b5d2..a8fc0754e 100644 --- a/src/main/resources/assets/botania/lang/pt_BR.lang +++ b/src/main/resources/assets/botania/lang/pt_BR.lang @@ -1504,7 +1504,7 @@ item.botania:terraAxe.name=Terra-Truncador item.botania:manasteelNugget.name=Pepita de Manasteel item.botania:terrasteelNugget.name=Pepita de Terrasteel item.botania:elementiumNugget.name=Pepita de Elementium -item.botania:root.name=Raíz-viva +item.botania:livingRoot.name=Raíz-viva item.botania:pebble.name=Seixo item.botania:waterBowl.name=Tigela de água item.botania:obedienceStick.name=Varinha da Obediência Floral diff --git a/src/main/resources/assets/botania/lang/zh_CN.lang b/src/main/resources/assets/botania/lang/zh_CN.lang index a62103994..ae0cdb139 100644 --- a/src/main/resources/assets/botania/lang/zh_CN.lang +++ b/src/main/resources/assets/botania/lang/zh_CN.lang @@ -1535,7 +1535,7 @@ item.botania:terraAxe.name=泰拉断裂者 item.botania:manasteelNugget.name=魔钢粒 item.botania:terrasteelNugget.name=泰拉钢粒 item.botania:elementiumNugget.name=源质钢粒 -item.botania:root.name=活根 +item.botania:livingRoot.name=活根 item.botania:pebble.name=卵石 item.botania:waterBowl.name=一碗水 item.botania:obedienceStick.name=植物遵从法杖 diff --git a/src/main/resources/assets/botania/lang/zh_TW.lang b/src/main/resources/assets/botania/lang/zh_TW.lang index e9b345cb3..2f5b1b307 100644 --- a/src/main/resources/assets/botania/lang/zh_TW.lang +++ b/src/main/resources/assets/botania/lang/zh_TW.lang @@ -1544,7 +1544,7 @@ item.botania:terraAxe.name=泰拉斷裂者 item.botania:manasteelNugget.name=魔鋼粒 item.botania:terrasteelNugget.name=泰拉鋼粒 item.botania:elementiumNugget.name=源質鋼粒 -item.botania:root.name=活根 +item.botania:livingRoot.name=活根 item.botania:pebble.name=卵石 item.botania:waterBowl.name=一碗水 item.botania:obedienceStick.name=植物遵從法杖 diff --git a/src/main/resources/assets/botania/models/item/root.json b/src/main/resources/assets/botania/models/item/livingRoot.json similarity index 100% rename from src/main/resources/assets/botania/models/item/root.json rename to src/main/resources/assets/botania/models/item/livingRoot.json From 2877d304ceb96f6017b7ca7af861e6dd071612d2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 13 Aug 2016 12:50:17 -0500 Subject: [PATCH 28/37] Mana blaster now shows active lens on model --- .../core/handler/MiscellaneousIcons.java | 11 + .../vazkii/botania/client/model/GunModel.java | 171 ++++++++ .../botania/common/item/ItemManaGun.java | 44 +- .../assets/botania/models/item/manaGun.json | 395 +++++++++--------- .../botania/models/item/manaGunClip.json | 6 +- 5 files changed, 405 insertions(+), 222 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/model/GunModel.java diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index a7dcbe448..de96858f4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -10,6 +10,7 @@ package vazkii.botania.client.core.handler; import com.google.common.collect.Maps; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; @@ -24,6 +25,7 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.model.FloatingFlowerModel; +import vazkii.botania.client.model.GunModel; import vazkii.botania.client.model.LexiconModel; import vazkii.botania.client.model.PlatformModel; import vazkii.botania.common.Botania; @@ -97,6 +99,15 @@ public class MiscellaneousIcons { // Lexicon evt.getModelRegistry().putObject(new ModelResourceLocation("botania:lexicon", "inventory"), new LexiconModel()); + + // Mana Blaster + ModelResourceLocation key = new ModelResourceLocation("botania:manaGun", "inventory"); + IBakedModel originalModel = evt.getModelRegistry().getObject(key); + evt.getModelRegistry().putObject(key, new GunModel(originalModel)); + + key = new ModelResourceLocation("botania:manaGunClip", "inventory"); + originalModel = evt.getModelRegistry().getObject(key); + evt.getModelRegistry().putObject(key, new GunModel(originalModel)); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/client/model/GunModel.java b/src/main/java/vazkii/botania/client/model/GunModel.java new file mode 100644 index 000000000..0e0140c25 --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/GunModel.java @@ -0,0 +1,171 @@ +package vazkii.botania.client.model; + +import com.google.common.base.Preconditions; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.collect.ImmutableList; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraft.client.renderer.block.model.ModelManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.vertex.VertexFormatElement; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; +import net.minecraftforge.client.model.IPerspectiveAwareModel; +import net.minecraftforge.client.model.pipeline.IVertexConsumer; +import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; +import net.minecraftforge.client.model.pipeline.VertexTransformer; +import net.minecraftforge.common.model.TRSRTransformation; +import org.apache.commons.lang3.tuple.Pair; +import vazkii.botania.common.Botania; +import vazkii.botania.common.item.ItemManaGun; +import vazkii.botania.common.item.ModItems; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import javax.vecmath.Matrix4f; +import javax.vecmath.Vector3f; +import javax.vecmath.Vector4f; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +public class GunModel implements IBakedModel { + + private final IBakedModel originalModel; + + public GunModel(IBakedModel originalModel) { + this.originalModel = Preconditions.checkNotNull(originalModel); + } + + private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { + @Nonnull + @Override + public IBakedModel handleItemState(@Nonnull IBakedModel model, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase entity) { + ItemStack lens = ItemManaGun.getLens(stack); + if(lens != null) { + IBakedModel lensModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(lens); + return GunModel.this.getModel(lensModel); + } + else return GunModel.this; + } + }; + + @Nonnull + @Override + public ItemOverrideList getOverrides() { + return itemHandler; + } + + @Nonnull @Override public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, long rand) { return originalModel.getQuads(state, side, rand); } + @Override public boolean isAmbientOcclusion() { return originalModel.isAmbientOcclusion(); } + @Override public boolean isGui3d() { return originalModel.isGui3d(); } + @Override public boolean isBuiltInRenderer() { return originalModel.isBuiltInRenderer(); } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return originalModel.getParticleTexture(); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return originalModel.getItemCameraTransforms(); } + + private final IdentityHashMap cache = new IdentityHashMap<>(); + + private CompositeBakedModel getModel(IBakedModel lens) { + CompositeBakedModel model = cache.get(lens); + if(model == null) { + model = new CompositeBakedModel(lens, originalModel); + cache.put(lens, model); + } + return model; + } + + protected static BakedQuad transform(BakedQuad quad, final TRSRTransformation transform) { + UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(DefaultVertexFormats.ITEM); + final IVertexConsumer consumer = new VertexTransformer(builder) { + @Override + public void put(int element, float... data) { + VertexFormatElement formatElement = DefaultVertexFormats.ITEM.getElement(element); + switch(formatElement.getUsage()) { + case POSITION: { + float[] newData = new float[4]; + Vector4f vec = new Vector4f(data); + transform.getMatrix().transform(vec); + vec.get(newData); + parent.put(element, newData); + break; + } + default: { + parent.put(element, data); + break; + } + } + } + }; + quad.pipe(consumer); + return builder.build(); + } + + private static class CompositeBakedModel implements IPerspectiveAwareModel { + + private final IBakedModel gun; + private final List genQuads; + private final Map> faceQuads = new EnumMap<>(EnumFacing.class); + + CompositeBakedModel(IBakedModel lens, IBakedModel gun) { + this.gun = gun; + + ImmutableList.Builder genBuilder = ImmutableList.builder(); + final TRSRTransformation transform = TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(-0.4F, 0.25F, 0), null, new Vector3f(0.625F, 0.625F, 0.625F), TRSRTransformation.quatFromXYZ(0, (float) Math.PI / 2, 0))); + + for(EnumFacing e : EnumFacing.VALUES) + faceQuads.put(e, new ArrayList<>()); + + // Add lens quads, scaled and translated + for(BakedQuad quad : lens.getQuads(null, null, 0)) { + genBuilder.add(transform(quad, transform)); + } + + for(EnumFacing e : EnumFacing.VALUES) { + faceQuads.get(e).addAll(lens.getQuads(null, e, 0).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); + } + + // Add gun quads + genBuilder.addAll(gun.getQuads(null, null, 0)); + for(EnumFacing e : EnumFacing.VALUES) { + faceQuads.get(e).addAll(gun.getQuads(null, e, 0)); + } + + genQuads = genBuilder.build(); + + } + + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { return face == null ? genQuads : faceQuads.get(face); } + + // Forward all to gun model + @Override public boolean isAmbientOcclusion() { return gun.isAmbientOcclusion(); } + @Override public boolean isGui3d() { return gun.isGui3d(); } + @Override public boolean isBuiltInRenderer() { return gun.isBuiltInRenderer(); } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return gun.getParticleTexture();} + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return gun.getItemCameraTransforms(); } + @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } + + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + if(gun instanceof IPerspectiveAwareModel) { + Pair pair = ((IPerspectiveAwareModel) gun).handlePerspective(cameraTransformType); + if(pair != null && pair.getRight() != null) + return Pair.of(this, pair.getRight()); + } + return Pair.of(this, TRSRTransformation.identity().getMatrix()); + } + } + +} diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 5fd2d2163..539116ae1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -29,6 +30,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -75,9 +77,6 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { RecipeSorter.register("botania:manaGunLens", ManaGunLensRecipe.class, Category.SHAPELESS, ""); RecipeSorter.register("botania:manaGunRemoveLens", ManaGunRemoveLensRecipe.class, Category.SHAPELESS, ""); RecipeSorter.register("botania:manaGunClip", ManaGunClipRecipe.class, Category.SHAPELESS, ""); - - addPropertyOverride(new ResourceLocation("botania", "clip"), (itemStack, world, entityLivingBase) -> hasClip(itemStack) ? 1 : 0); - addPropertyOverride(new ResourceLocation("botania", "desu"), (itemStack, world, entityLivingBase) -> isSugoiKawaiiDesuNe(itemStack) ? 1 : 0); } @Nonnull @@ -141,17 +140,21 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { @Override @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int tintIndex) { - if(tintIndex != 1) - return 0xFFFFFF; + public int getColorFromItemStack(ItemStack stack, int tintIndex) { + ItemStack lens = getLens(stack); + if(lens != null && tintIndex == 0) + return ((IColorable) ModItems.lens).getColorFromItemStack(lens, tintIndex); - EntityManaBurst burst = getBurst(Minecraft.getMinecraft().thePlayer, par1ItemStack, false); - Color color = new Color(burst == null ? 0x20FF20 : burst.getColor()); + if(tintIndex == 2) { + EntityManaBurst burst = getBurst(Minecraft.getMinecraft().thePlayer, stack, false); + Color color = new Color(burst == null ? 0x20FF20 : burst.getColor()); - float mul = (float) (Math.sin((double) ClientTickHandler.ticksInGame / 5) * 0.15F); - int c = (int) (255 * mul); + float mul = (float) (Math.sin((double) ClientTickHandler.ticksInGame / 5) * 0.15F); + int c = (int) (255 * mul); + + return new Color(Math.max(0, Math.min(255, color.getRed() + c)), Math.max(0, Math.min(255, color.getGreen() + c)), Math.max(0, Math.min(255, color.getBlue() + c))).getRGB(); + } else return 0xFFFFFF; - return new Color(Math.max(0, Math.min(255, color.getRed() + c)), Math.max(0, Math.min(255, color.getGreen() + c)), Math.max(0, Math.min(255, color.getBlue() + c))).getRGB(); } @Override @@ -331,4 +334,23 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { public boolean usesMana(ItemStack stack) { return true; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.registerItemVariants(this, + new ModelResourceLocation("botania:desuGunClip", "inventory"), + new ModelResourceLocation("botania:desuGun", "inventory"), + new ModelResourceLocation("botania:manaGunClip", "inventory"), + new ModelResourceLocation("botania:manaGun", "inventory")); + ModelLoader.setCustomMeshDefinition(this, stack -> { + if (hasClip(stack) && isSugoiKawaiiDesuNe(stack)) + return new ModelResourceLocation("botania:desuGunClip", "inventory"); + else if (isSugoiKawaiiDesuNe(stack)) + return new ModelResourceLocation("botania:desuGun", "inventory"); + else if(hasClip(stack)) + return new ModelResourceLocation("botania:manaGunClip", "inventory"); + else return new ModelResourceLocation("botania:manaGun", "inventory"); + }); + } } diff --git a/src/main/resources/assets/botania/models/item/manaGun.json b/src/main/resources/assets/botania/models/item/manaGun.json index 5e6ef87b7..2173f234e 100644 --- a/src/main/resources/assets/botania/models/item/manaGun.json +++ b/src/main/resources/assets/botania/models/item/manaGun.json @@ -1,209 +1,188 @@ -{ - "__comment": "Author: wiiv", - "textures": { - "layer0": "botania:items/manaBlaster", - "layer1": "botania:items/manaBlasterColor", - "layer2": "botania:items/manaBlasterGlass" - }, - "elements": [ - { - "name": "Barrel1", - "from": [ -10.0, 5.0, 5.5 ], - "to": [ -3.0, 14.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 0.0, 7.01, 3.5, 11.49 ] }, - "east": { "texture": "layer0", "uv": [ 6.0, 7.0, 8.5, 11.5 ] }, - "south": { "texture": "layer0", "uv": [ 3.5, 7.01, 0.0, 11.49 ] }, - "west": { "texture": "layer0", "uv": [ 3.5, 7.01, 6.0, 11.49 ] }, - "up": { "texture": "layer0", "uv": [ 11.01, 10.5, 13.49, 13.99 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 13.5, 10.5, 16.0, 14.0 ], "rotation": 90 } - } - }, - { - "name": "Barrel2", - "from": [ -3.0, 5.0, 5.5 ], - "to": [ 7.0, 9.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 11.01, 14.0, 15.99, 15.99 ] }, - "south": { "texture": "layer0", "uv": [ 16.0, 14.0, 11.0, 16.0 ] }, - "up": { "texture": "layer0", "uv": [ 11.01, 5.0, 13.49, 10.0 ], "rotation": 270 }, - "down": { "texture": "layer0", "uv": [ 13.5, 5.0, 15.99, 10.0 ], "rotation": 270 } - } - }, - { - "name": "Barrel3", - "from": [ 7.0, 5.0, 5.5 ], - "to": [ 10.0, 14.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 0.0, 11.5, 1.5, 16.0 ] }, - "east": { "texture": "layer0", "uv": [ 1.5, 11.5, 4.0, 16.0 ] }, - "south": { "texture": "layer0", "uv": [ 0.0, 11.5, 1.5, 16.0 ] }, - "west": { "texture": "layer0", "uv": [ 1.5, 11.5, 4.0, 16.0 ] }, - "up": { "texture": "layer0", "uv": [ 11.0, 4.0, 13.5, 5.5 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 13.5, 4.0, 16.0, 5.5 ], "rotation": 90 } - } - }, - { - "name": "Barrel4", - "from": [ 10.0, 12.0, 5.5 ], - "to": [ 18.0, 14.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 4.01, 14.5, 8.0, 15.5 ] }, - "east": { "texture": "layer0", "uv": [ 4.0, 14.5, 6.5, 15.5 ] }, - "south": { "texture": "layer0", "uv": [ 8.0, 14.5, 4.0, 15.5 ] }, - "up": { "texture": "layer0", "uv": [ 11.01, 0.01, 13.49, 3.99 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 11.0, 0.01, 13.5, 4.0 ], "rotation": 90 } - } - }, - { - "name": "Barrel5", - "from": [ 10.0, 9.0, 5.5 ], - "to": [ 18.0, 11.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 8.0, 14.5, 4.0, 15.5 ] }, - "east": { "texture": "layer0", "uv": [ 6.5, 14.5, 4.0, 15.5 ] }, - "south": { "texture": "layer0", "uv": [ 4.0, 14.5, 8.0, 15.5 ] }, - "up": { "texture": "layer0", "uv": [ 11.01, 0.0, 13.49, 3.99 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 13.51, 0.01, 15.99, 3.99 ], "rotation": 90 } - } - }, - { - "name": "Strap", - "from": [ 14.0, -5.0, 6.5 ], - "to": [ 19.0, 9.0, 9.5 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 22.5 }, - "faces": { - "north": { "texture": "layer0", "uv": [ 0.0, 0.01, 2.5, 6.99 ] }, - "east": { "texture": "layer0", "uv": [ 4.0, 0.01, 5.5, 6.99 ] }, - "south": { "texture": "layer0", "uv": [ 2.5, 0.01, 0.0, 6.99 ] }, - "west": { "texture": "layer0", "uv": [ 2.5, 0.01, 4.0, 6.99 ] }, - "down": { "texture": "layer0", "uv": [ 5.5, 0.0, 7.0, 2.5 ], "rotation": 90 } - } - }, - { - "name": "Magazine", - "from": [ 12.5, -6.0, 7.0 ], - "to": [ 18.5, -5.0, 9.0 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 22.5 }, - "faces": { - "north": { "texture": "layer0", "uv": [ 7.5, 0.0, 8.0, 3.0 ], "rotation": 90 }, - "east": { "texture": "layer0", "uv": [ 8.0, 0.0, 7.0, 0.5 ] }, - "south": { "texture": "layer0", "uv": [ 8.0, 0.01, 7.5, 3.0 ], "rotation": 90 }, - "west": { "texture": "layer0", "uv": [ 7.0, 0.01, 8.0, 0.5 ] }, - "up": { "texture": "layer0", "uv": [ 7.0, 0.01, 8.0, 3.0 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 7.01, 0.0, 7.99, 3.0 ], "rotation": 90 } - } - }, - { - "name": "Trigger Guard1", - "from": [ 10.0, 6.0, 7.0 ], - "to": [ 16.0, 7.0, 9.0 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 5.5, 3.01, 8.5, 3.5 ] }, - "south": { "texture": "layer0", "uv": [ 5.5, 3.01, 8.5, 3.49 ] }, - "up": { "texture": "layer0", "uv": [ 5.5, 3.0, 8.5, 4.0 ] }, - "down": { "texture": "layer0", "uv": [ 5.5, 3.0, 8.5, 4.0 ] } - } - }, - { - "name": "Trigger", - "from": [ 13.0, 7.0, 7.5 ], - "to": [ 16.0, 9.0, 8.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 6.0 ] }, - "south": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 6.0 ] }, - "west": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 5.5 ] } - } - }, - { - "name": "Trigger Guard2", - "from": [ 10.0, 7.0, 7.0 ], - "to": [ 11.0, 9.0, 9.0 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.0, 5.0 ] }, - "east": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.5, 5.0 ] }, - "south": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.0, 5.0 ] } - } - }, - { - "name": "Colorizer", - "from": [ 9.5, 11.0, 6.0 ], - "to": [ 17.5, 12.0, 10.0 ], - "faces": { - "north": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 1 }, - "east": { "texture": "layer1", "uv": [ 0.0, 0.0, 5.0, 5.0 ], "tintindex": 1 }, - "south": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 1 } - } - }, - { - "name": "Glass", - "from": [ -3.5, 9.5, 6.0 ], - "to": [ 7.5, 13.5, 10.0 ], - "faces": { - "north": { "texture": "layer2", "uv": [ 0.01, 7.01, 6.99, 7.99 ] }, - "east": { "texture": "layer2", "uv": [ 7.01, 7.01, 9.49, 7.99 ] }, - "south": { "texture": "layer2", "uv": [ 6.99, 7.01, 0.01, 7.99 ] }, - "up": { "texture": "layer2", "uv": [ 11.01, 0.01, 13.49, 6.99 ] }, - "down": { "texture": "layer2", "uv": [ 8.51, 0.01, 6.99, 9.99 ] } - } - } - ], - "display": { - "gui": { - "rotation": [ 0, -20, -40 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.45, 0.45, 0.45 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 90, 0 ], - "translation": [ 0, 2.45, -1.5 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "thirdperson_righthand": { - "rotation": [ 0, -90, 0 ], - "translation": [ 0, 2.45, -1.5 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "firstperson_lefthand": { - "rotation": [ 10, 80, -5 ], - "translation": [ 0.8, 2.5, 0 ], - "scale": [ 0.45, 0.45, 0.45 ] - }, - "firstperson_righthand": { - "rotation": [ 10, -80, 5 ], - "translation": [ -1.8, 2.5, 0 ], - "scale": [ 0.45, 0.45, 0.45 ] - } - }, - "overrides": [ - { - "predicate": { - "botania:desu": 1, - "botania:clip": 1 - }, - "model": "botania:item/desuGunClip" - }, - { - "predicate": { - "botania:clip": 1 - }, - "model": "botania:item/manaGunClip" - }, - { - "predicate": { - "botania:desu": 1 - }, - "model": "botania:item/desuGun" - } - ] +{ + "__comment": "Author: wiiv", + "textures": { + "layer0": "botania:items/manaBlaster", + "layer1": "botania:items/manaBlasterColor", + "layer2": "botania:items/manaBlasterGlass" + }, + "elements": [ + { + "name": "Barrel1", + "from": [ -10.0, 5.0, 5.5 ], + "to": [ -3.0, 14.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 0.0, 7.01, 3.5, 11.49 ] }, + "east": { "texture": "layer0", "uv": [ 6.0, 7.0, 8.5, 11.5 ] }, + "south": { "texture": "layer0", "uv": [ 3.5, 7.01, 0.0, 11.49 ] }, + "west": { "texture": "layer0", "uv": [ 3.5, 7.01, 6.0, 11.49 ] }, + "up": { "texture": "layer0", "uv": [ 11.01, 10.5, 13.49, 13.99 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 13.5, 10.5, 16.0, 14.0 ], "rotation": 90 } + } + }, + { + "name": "Barrel2", + "from": [ -3.0, 5.0, 5.5 ], + "to": [ 7.0, 9.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 11.01, 14.0, 15.99, 15.99 ] }, + "south": { "texture": "layer0", "uv": [ 16.0, 14.0, 11.0, 16.0 ] }, + "up": { "texture": "layer0", "uv": [ 11.01, 5.0, 13.49, 10.0 ], "rotation": 270 }, + "down": { "texture": "layer0", "uv": [ 13.5, 5.0, 15.99, 10.0 ], "rotation": 270 } + } + }, + { + "name": "Barrel3", + "from": [ 7.0, 5.0, 5.5 ], + "to": [ 10.0, 14.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 0.0, 11.5, 1.5, 16.0 ] }, + "east": { "texture": "layer0", "uv": [ 1.5, 11.5, 4.0, 16.0 ] }, + "south": { "texture": "layer0", "uv": [ 0.0, 11.5, 1.5, 16.0 ] }, + "west": { "texture": "layer0", "uv": [ 1.5, 11.5, 4.0, 16.0 ] }, + "up": { "texture": "layer0", "uv": [ 11.0, 4.0, 13.5, 5.5 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 13.5, 4.0, 16.0, 5.5 ], "rotation": 90 } + } + }, + { + "name": "Barrel4", + "from": [ 10.0, 12.0, 5.5 ], + "to": [ 18.0, 14.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 4.01, 14.5, 8.0, 15.5 ] }, + "east": { "texture": "layer0", "uv": [ 4.0, 14.5, 6.5, 15.5 ] }, + "south": { "texture": "layer0", "uv": [ 8.0, 14.5, 4.0, 15.5 ] }, + "up": { "texture": "layer0", "uv": [ 11.01, 0.01, 13.49, 3.99 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 11.0, 0.01, 13.5, 4.0 ], "rotation": 90 } + } + }, + { + "name": "Barrel5", + "from": [ 10.0, 9.0, 5.5 ], + "to": [ 18.0, 11.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 8.0, 14.5, 4.0, 15.5 ] }, + "east": { "texture": "layer0", "uv": [ 6.5, 14.5, 4.0, 15.5 ] }, + "south": { "texture": "layer0", "uv": [ 4.0, 14.5, 8.0, 15.5 ] }, + "up": { "texture": "layer0", "uv": [ 11.01, 0.0, 13.49, 3.99 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 13.51, 0.01, 15.99, 3.99 ], "rotation": 90 } + } + }, + { + "name": "Strap", + "from": [ 14.0, -5.0, 6.5 ], + "to": [ 19.0, 9.0, 9.5 ], + "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 22.5 }, + "faces": { + "north": { "texture": "layer0", "uv": [ 0.0, 0.01, 2.5, 6.99 ] }, + "east": { "texture": "layer0", "uv": [ 4.0, 0.01, 5.5, 6.99 ] }, + "south": { "texture": "layer0", "uv": [ 2.5, 0.01, 0.0, 6.99 ] }, + "west": { "texture": "layer0", "uv": [ 2.5, 0.01, 4.0, 6.99 ] }, + "down": { "texture": "layer0", "uv": [ 5.5, 0.0, 7.0, 2.5 ], "rotation": 90 } + } + }, + { + "name": "Magazine", + "from": [ 12.5, -6.0, 7.0 ], + "to": [ 18.5, -5.0, 9.0 ], + "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 22.5 }, + "faces": { + "north": { "texture": "layer0", "uv": [ 7.5, 0.0, 8.0, 3.0 ], "rotation": 90 }, + "east": { "texture": "layer0", "uv": [ 8.0, 0.0, 7.0, 0.5 ] }, + "south": { "texture": "layer0", "uv": [ 8.0, 0.01, 7.5, 3.0 ], "rotation": 90 }, + "west": { "texture": "layer0", "uv": [ 7.0, 0.01, 8.0, 0.5 ] }, + "up": { "texture": "layer0", "uv": [ 7.0, 0.01, 8.0, 3.0 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 7.01, 0.0, 7.99, 3.0 ], "rotation": 90 } + } + }, + { + "name": "Trigger Guard1", + "from": [ 10.0, 6.0, 7.0 ], + "to": [ 16.0, 7.0, 9.0 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 5.5, 3.01, 8.5, 3.5 ] }, + "south": { "texture": "layer0", "uv": [ 5.5, 3.01, 8.5, 3.49 ] }, + "up": { "texture": "layer0", "uv": [ 5.5, 3.0, 8.5, 4.0 ] }, + "down": { "texture": "layer0", "uv": [ 5.5, 3.0, 8.5, 4.0 ] } + } + }, + { + "name": "Trigger", + "from": [ 13.0, 7.0, 7.5 ], + "to": [ 16.0, 9.0, 8.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 6.0 ] }, + "south": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 6.0 ] }, + "west": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 5.5 ] } + } + }, + { + "name": "Trigger Guard2", + "from": [ 10.0, 7.0, 7.0 ], + "to": [ 11.0, 9.0, 9.0 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.0, 5.0 ] }, + "east": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.5, 5.0 ] }, + "south": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.0, 5.0 ] } + } + }, + { + "name": "Colorizer", + "from": [ 9.5, 11.0, 6.0 ], + "to": [ 17.5, 12.0, 10.0 ], + "faces": { + "north": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 2 }, + "east": { "texture": "layer1", "uv": [ 0.0, 0.0, 5.0, 5.0 ], "tintindex": 2 }, + "south": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 2 } + } + }, + { + "name": "Glass", + "from": [ -3.5, 9.5, 6.0 ], + "to": [ 7.5, 13.5, 10.0 ], + "faces": { + "north": { "texture": "layer2", "uv": [ 0.01, 7.01, 6.99, 7.99 ] }, + "east": { "texture": "layer2", "uv": [ 7.01, 7.01, 9.49, 7.99 ] }, + "south": { "texture": "layer2", "uv": [ 6.99, 7.01, 0.01, 7.99 ] }, + "up": { "texture": "layer2", "uv": [ 11.01, 0.01, 13.49, 6.99 ] }, + "down": { "texture": "layer2", "uv": [ 8.51, 0.01, 6.99, 9.99 ] } + } + } + ], + "display": { + "gui": { + "rotation": [ 0, -20, -40 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "fixed": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.45, 0.45, 0.45 ] + }, + "thirdperson_lefthand": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 2.45, -1.5 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "thirdperson_righthand": { + "rotation": [ 0, -90, 0 ], + "translation": [ 0, 2.45, -1.5 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "firstperson_lefthand": { + "rotation": [ 10, 80, -5 ], + "translation": [ 0.8, 2.5, 0 ], + "scale": [ 0.45, 0.45, 0.45 ] + }, + "firstperson_righthand": { + "rotation": [ 10, -80, 5 ], + "translation": [ -1.8, 2.5, 0 ], + "scale": [ 0.45, 0.45, 0.45 ] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaGunClip.json b/src/main/resources/assets/botania/models/item/manaGunClip.json index f13aec897..aa7221398 100644 --- a/src/main/resources/assets/botania/models/item/manaGunClip.json +++ b/src/main/resources/assets/botania/models/item/manaGunClip.json @@ -131,9 +131,9 @@ "from": [ 9.5, 11.0, 6.0 ], "to": [ 17.5, 12.0, 10.0 ], "faces": { - "north": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 1 }, - "east": { "texture": "layer1", "uv": [ 0.0, 0.0, 5.0, 5.0 ], "tintindex": 1 }, - "south": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 1 } + "north": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 2 }, + "east": { "texture": "layer1", "uv": [ 0.0, 0.0, 5.0, 5.0 ], "tintindex": 2 }, + "south": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 2 } } }, { From 1eafb2e85ebd95557949ca07e795445f534c5057 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 13 Aug 2016 14:26:10 -0500 Subject: [PATCH 29/37] Update forge, fix tooltips additions not matching item tooltip. Closes #219 --- build.properties | 2 +- .../core/handler/ClientTickHandler.java | 1 - .../TooltipAdditionDisplayHandler.java | 222 ++++++++---------- .../client/core/proxy/ClientProxy.java | 2 + .../vazkii/botania/common/lib/LibMisc.java | 2 +- 5 files changed, 102 insertions(+), 127 deletions(-) diff --git a/build.properties b/build.properties index 066331106..bcf2bac3d 100644 --- a/build.properties +++ b/build.properties @@ -4,6 +4,6 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ mc_version=1.10.2 -forge_version=12.18.1.2046 +forge_version=12.18.1.2056 build_number=316 mod_name=Botania diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index 8d2f897cd..1fa7197b0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -50,7 +50,6 @@ public final class ClientTickHandler { if(event.phase == Phase.START) partialTicks = event.renderTickTime; else { - TooltipAdditionDisplayHandler.render(); calcDelta(); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java index 344e44df7..a4ec22c11 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -25,6 +25,8 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.client.event.RenderTooltipEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; @@ -47,133 +49,105 @@ public final class TooltipAdditionDisplayHandler { private static float lexiconLookupTime = 0F; - public static void render() { + @SubscribeEvent + public static void onToolTipRender(RenderTooltipEvent.PostText evt) { + if(evt.getStack() == null) + return; + + ItemStack stack = evt.getStack(); Minecraft mc = Minecraft.getMinecraft(); - GuiScreen gui = mc.currentScreen; - if(gui != null && gui instanceof GuiContainer && mc.thePlayer != null && mc.thePlayer.inventory.getItemStack() == null) { - GuiContainer container = (GuiContainer) gui; - Slot slot = container.getSlotUnderMouse(); - if(slot != null && slot.getHasStack()) { - ItemStack stack = slot.getStack(); - if(stack != null) { - ScaledResolution res = new ScaledResolution(mc); - FontRenderer font = mc.fontRendererObj; - int mouseX = Mouse.getX() * res.getScaledWidth() / mc.displayWidth; - int mouseY = res.getScaledHeight() - Mouse.getY() * res.getScaledHeight() / mc.displayHeight; + int width = evt.getWidth(); + int height = 3; + int tooltipX = evt.getX(); + int tooltipY = evt.getY() - 4; + FontRenderer font = evt.getFontRenderer(); - List tooltip; - try { - tooltip = stack.getTooltip(mc.thePlayer, mc.gameSettings.advancedItemTooltips); - } catch(Exception e) { - tooltip = new ArrayList<>(); + if(stack.getItem() instanceof ItemTerraPick) + drawTerraPick(stack, tooltipX, tooltipY, width, height, font); + else if(stack.getItem() instanceof IManaTooltipDisplay) + drawManaBar(stack, (IManaTooltipDisplay) stack.getItem(), tooltipX, tooltipY, width, height); + + EntryData data = LexiconRecipeMappings.getDataForStack(stack); + if(data != null) { + int lexSlot = -1; + ItemStack lexiconStack = null; + + for(int i = 0; i < InventoryPlayer.getHotbarSize(); i++) { + ItemStack stackAt = mc.thePlayer.inventory.getStackInSlot(i); + if(stackAt != null && stackAt.getItem() instanceof ILexicon && ((ILexicon) stackAt.getItem()).isKnowledgeUnlocked(stackAt, data.entry.getKnowledgeType())) { + lexiconStack = stackAt; + lexSlot = i; + break; + } + } + + if(lexSlot > -1) { + int x = tooltipX - 34; + GlStateManager.disableDepth(); + + Gui.drawRect(x - 4, tooltipY - 4, x + 20, tooltipY + 26, 0x44000000); + Gui.drawRect(x - 6, tooltipY - 6, x + 22, tooltipY + 28, 0x44000000); + + if(ConfigHandler.useShiftForQuickLookup ? GuiScreen.isShiftKeyDown() : GuiScreen.isCtrlKeyDown()) { + lexiconLookupTime += ClientTickHandler.delta; + + int cx = x + 8; + int cy = tooltipY + 8; + float r = 12; + float time = 20F; + float angles = lexiconLookupTime / time * 360F; + + GlStateManager.disableLighting(); + GlStateManager.disableTexture2D(); + GlStateManager.shadeModel(GL11.GL_SMOOTH); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + VertexBuffer buf = Tessellator.getInstance().getBuffer(); + buf.begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); + + float a = 0.5F + 0.2F * ((float) Math.cos((double) (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) / 10) * 0.5F + 0.5F); + buf.pos(cx, cy, 0).color(0F, 0.5F, 0F, a).endVertex(); + + for(float i = angles; i > 0; i--) { + double rad = (i - 90) / 180F * Math.PI; + buf.pos(cx + Math.cos(rad) * r, cy + Math.sin(rad) * r, 0).color(0F, 1F, 0F, 1F).endVertex(); } - int width = 0; - for(String s : tooltip) - width = Math.max(width, font.getStringWidth(s) + 2); - int tooltipHeight = (tooltip.size() - 1) * 10 + 5; - int height = 3; - int offx = 11; - int offy = 17; + buf.pos(cx, cy, 0).color(0F, 1F, 0F, 0F).endVertex(); + Tessellator.getInstance().draw(); - boolean offscreen = mouseX + width + 19 >= res.getScaledWidth(); + GlStateManager.disableBlend(); + GlStateManager.enableTexture2D(); + GlStateManager.shadeModel(GL11.GL_FLAT); - int fixY = res.getScaledHeight() - (mouseY + tooltipHeight); - if(fixY < 0) - offy -= fixY; - if(offscreen) - offx = -13 - width; + if(lexiconLookupTime >= time) { + mc.thePlayer.inventory.currentItem = lexSlot; + Botania.proxy.setEntryToOpen(data.entry); + Botania.proxy.setLexiconStack(lexiconStack); + mc.thePlayer.closeScreen(); + ItemLexicon.openBook(mc.thePlayer, lexiconStack, mc.theWorld, false); - if(stack.getItem() instanceof ItemTerraPick) - drawTerraPick(stack, mouseX, mouseY, offx, offy, width, height, font); - else if(stack.getItem() instanceof IManaTooltipDisplay) - drawManaBar(stack, (IManaTooltipDisplay) stack.getItem(), mouseX, mouseY, offx, offy, width, height); - - EntryData data = LexiconRecipeMappings.getDataForStack(stack); - if(data != null) { - int lexSlot = -1; - ItemStack lexiconStack = null; - - for(int i = 0; i < InventoryPlayer.getHotbarSize(); i++) { - ItemStack stackAt = mc.thePlayer.inventory.getStackInSlot(i); - if(stackAt != null && stackAt.getItem() instanceof ILexicon && ((ILexicon) stackAt.getItem()).isKnowledgeUnlocked(stackAt, data.entry.getKnowledgeType())) { - lexiconStack = stackAt; - lexSlot = i; - break; - } - } - - if(lexSlot > -1) { - int x = mouseX + offx - 34; - int y = mouseY - offy; - GlStateManager.disableDepth(); - - Gui.drawRect(x - 4, y - 4, x + 20, y + 26, 0x44000000); - Gui.drawRect(x - 6, y - 6, x + 22, y + 28, 0x44000000); - - if(ConfigHandler.useShiftForQuickLookup ? GuiScreen.isShiftKeyDown() : GuiScreen.isCtrlKeyDown()) { - lexiconLookupTime += ClientTickHandler.delta; - - int cx = x + 8; - int cy = y + 8; - float r = 12; - float time = 20F; - float angles = lexiconLookupTime / time * 360F; - - GlStateManager.disableLighting(); - GlStateManager.disableTexture2D(); - GlStateManager.shadeModel(GL11.GL_SMOOTH); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - VertexBuffer buf = Tessellator.getInstance().getBuffer(); - buf.begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); - - float a = 0.5F + 0.2F * ((float) Math.cos((double) (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) / 10) * 0.5F + 0.5F); - buf.pos(cx, cy, 0).color(0F, 0.5F, 0F, a).endVertex(); - - for(float i = angles; i > 0; i--) { - double rad = (i - 90) / 180F * Math.PI; - buf.pos(cx + Math.cos(rad) * r, cy + Math.sin(rad) * r, 0).color(0F, 1F, 0F, 1F).endVertex(); - } - - buf.pos(cx, cy, 0).color(0F, 1F, 0F, 0F).endVertex(); - Tessellator.getInstance().draw(); - - GlStateManager.disableBlend(); - GlStateManager.enableTexture2D(); - GlStateManager.shadeModel(GL11.GL_FLAT); - - if(lexiconLookupTime >= time) { - mc.thePlayer.inventory.currentItem = lexSlot; - Botania.proxy.setEntryToOpen(data.entry); - Botania.proxy.setLexiconStack(lexiconStack); - mc.thePlayer.closeScreen(); - ItemLexicon.openBook(mc.thePlayer, lexiconStack, mc.theWorld, false); - - } - } else lexiconLookupTime = 0F; - - mc.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.lexicon), x, y); - GlStateManager.disableLighting(); - - font.drawStringWithShadow("?", x + 10, y + 8, 0xFFFFFFFF); - GlStateManager.scale(0.5F, 0.5F, 1F); - boolean mac = Minecraft.IS_RUNNING_ON_MAC; - - mc.fontRendererObj.drawStringWithShadow(TextFormatting.BOLD + (ConfigHandler.useShiftForQuickLookup ? "Shift" : mac ? "Cmd" : "Ctrl"), (x + 10) * 2 - 16, (y + 8) * 2 + 20, 0xFFFFFFFF); - GlStateManager.scale(2F, 2F, 1F); - - - GlStateManager.enableDepth(); - } else lexiconLookupTime = 0F; - } else lexiconLookupTime = 0F; + } } else lexiconLookupTime = 0F; + + mc.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.lexicon), x, tooltipY); + GlStateManager.disableLighting(); + + font.drawStringWithShadow("?", x + 10, tooltipY + 8, 0xFFFFFFFF); + GlStateManager.scale(0.5F, 0.5F, 1F); + boolean mac = Minecraft.IS_RUNNING_ON_MAC; + + mc.fontRendererObj.drawStringWithShadow(TextFormatting.BOLD + (ConfigHandler.useShiftForQuickLookup ? "Shift" : mac ? "Cmd" : "Ctrl"), (x + 10) * 2 - 16, (tooltipY + 8) * 2 + 20, 0xFFFFFFFF); + GlStateManager.scale(2F, 2F, 1F); + + + GlStateManager.enableDepth(); } else lexiconLookupTime = 0F; } else lexiconLookupTime = 0F; } - private static void drawTerraPick(ItemStack stack, int mouseX, int mouseY, int offx, int offy, int width, int height, FontRenderer font) { + private static void drawTerraPick(ItemStack stack, int mouseX, int mouseY, int width, int height, FontRenderer font) { int level = ItemTerraPick.getLevel(stack); int max = ItemTerraPick.LEVELS[Math.min(ItemTerraPick.LEVELS.length - 1, level + 1)]; boolean ss = level >= ItemTerraPick.LEVELS.length - 1; @@ -184,33 +158,33 @@ public final class TooltipAdditionDisplayHandler { float hueOff = (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.01F; GlStateManager.disableDepth(); - Gui.drawRect(mouseX + offx - 1, mouseY - offy - height - 1, mouseX + offx + width + 1, mouseY - offy, 0xFF000000); + Gui.drawRect(mouseX - 1, mouseY - height - 1, mouseX + width + 1, mouseY, 0xFF000000); for(int i = 0; i < rainbowWidth; i++) - Gui.drawRect(mouseX + offx + i, mouseY - offy - height, mouseX + offx + i + 1, mouseY - offy, Color.HSBtoRGB(hueOff + huePer * i, 1F, 1F)); - Gui.drawRect(mouseX + offx + rainbowWidth, mouseY - offy - height, mouseX + offx + width, mouseY - offy, 0xFF555555); + Gui.drawRect(mouseX + i, mouseY - height, mouseX + i + 1, mouseY, Color.HSBtoRGB(hueOff + huePer * i, 1F, 1F)); + Gui.drawRect(mouseX + rainbowWidth, mouseY - height, mouseX + width, mouseY, 0xFF555555); String rank = I18n.format("botania.rank" + level).replaceAll("&", "\u00a7"); GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GlStateManager.disableLighting(); - font.drawStringWithShadow(rank, mouseX + offx, mouseY - offy - 12, 0xFFFFFF); + font.drawStringWithShadow(rank, mouseX, mouseY - 12, 0xFFFFFF); if(!ss) { rank = I18n.format("botania.rank" + (level + 1)).replaceAll("&", "\u00a7"); - font.drawStringWithShadow(rank, mouseX + offx + width - font.getStringWidth(rank), mouseY - offy - 12, 0xFFFFFF); + font.drawStringWithShadow(rank, mouseX + width - font.getStringWidth(rank), mouseY - 12, 0xFFFFFF); } GlStateManager.enableLighting(); GlStateManager.enableDepth(); GL11.glPopAttrib(); } - private static void drawManaBar(ItemStack stack, IManaTooltipDisplay display, int mouseX, int mouseY, int offx, int offy, int width, int height) { + private static void drawManaBar(ItemStack stack, IManaTooltipDisplay display, int mouseX, int mouseY, int width, int height) { float fraction = display.getManaFractionForDisplay(stack); int manaBarWidth = (int) Math.ceil(width * fraction); GlStateManager.disableDepth(); - Gui.drawRect(mouseX + offx - 1, mouseY - offy - height - 1, mouseX + offx + width + 1, mouseY - offy, 0xFF000000); - Gui.drawRect(mouseX + offx, mouseY - offy - height, mouseX + offx + manaBarWidth, mouseY - offy, Color.HSBtoRGB(0.528F, ((float) Math.sin((ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.2) + 1F) * 0.3F + 0.4F, 1F)); - Gui.drawRect(mouseX + offx + manaBarWidth, mouseY - offy - height, mouseX + offx + width, mouseY - offy, 0xFF555555); + Gui.drawRect(mouseX - 1, mouseY - height - 1, mouseX + width + 1, mouseY, 0xFF000000); + Gui.drawRect(mouseX, mouseY - height, mouseX + manaBarWidth, mouseY, Color.HSBtoRGB(0.528F, ((float) Math.sin((ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.2) + 1F) * 0.3F + 0.4F, 1F)); + Gui.drawRect(mouseX + manaBarWidth, mouseY - height, mouseX + width, mouseY, 0xFF555555); } } diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index e9d82f2bc..42e989ed7 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -60,6 +60,7 @@ import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.handler.RenderLexicon; import vazkii.botania.client.core.handler.SubTileRadiusRenderHandler; +import vazkii.botania.client.core.handler.TooltipAdditionDisplayHandler; import vazkii.botania.client.core.handler.TooltipHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.fx.FXLightning; @@ -205,6 +206,7 @@ public class ClientProxy extends CommonProxy { if(ConfigHandler.boundBlockWireframe) MinecraftForge.EVENT_BUS.register(BoundTileRenderer.class); MinecraftForge.EVENT_BUS.register(TooltipHandler.class); + MinecraftForge.EVENT_BUS.register(TooltipAdditionDisplayHandler.class); MinecraftForge.EVENT_BUS.register(DebugHandler.class); MinecraftForge.EVENT_BUS.register(SubTileRadiusRenderHandler.class); MinecraftForge.EVENT_BUS.register(MultiblockRenderHandler.class); diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 89db6d30a..3bfdd51ee 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -17,7 +17,7 @@ public final class LibMisc { public static final String MOD_NAME = MOD_ID; public static final String BUILD = "GRADLE:BUILD"; public static final String VERSION = "GRADLE:VERSION-" + BUILD; - public static final String DEPENDENCIES = "required-after:Forge@[12.18.1.2042,];required-after:Baubles;after:Thaumcraft"; + public static final String DEPENDENCIES = "required-after:Forge@[12.18.1.2053,];required-after:Baubles;after:Thaumcraft"; public static final String MC_VERSIONS = "[1.10.2]"; public static final String UPDATE_JSON = "https://raw.githubusercontent.com/williewillus/Botania/HEAD/version/update.json"; From 687d475aeb7c3b41c4f4770d6598a7ddfa55406b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 13 Aug 2016 15:21:32 -0500 Subject: [PATCH 30/37] Corporea no longer runs clientside --- .../render/entity/RenderCorporeaSpark.java | 8 +-- .../common/entity/EntityCorporeaSpark.java | 69 +++++++++---------- .../botania/common/entity/EntitySpark.java | 8 ++- 3 files changed, 41 insertions(+), 44 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java index 59ac6f867..a307f797a 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -61,6 +61,10 @@ public class RenderCorporeaSpark extends RenderSparkBase { float absTime = Math.abs(time) - pticks; + ItemStack stack = entity.getDisplayedItem().orNull(); + if(stack == null) + return; + GlStateManager.pushMatrix(); GlStateManager.rotate(90F, 1F, 0F, 0F); float scalef = 1F / 6F; @@ -70,10 +74,6 @@ public class RenderCorporeaSpark extends RenderSparkBase { GlStateManager.color(1F, 1F, 1F, absTime / 10); GlStateManager.translate(0F, 0F, -2F + (time < 0 ? -absTime : absTime) / 6); - ItemStack stack = entity.getDisplayedItem().orNull(); - if(stack == null) - return; - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); TextureAtlasSprite icon = Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(stack, entity.worldObj, null).getParticleTexture(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 2c24f7131..d8737843c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -52,10 +52,8 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { private ICorporeaSpark master; private List connections = new ArrayList<>(); - private List connectionsClient = new ArrayList<>(); private List relatives = new ArrayList<>(); - private boolean firstUpdateClient = true; - private boolean firstUpdateServer = true; + private boolean firstTick = true; public EntityCorporeaSpark(World world) { super(world); @@ -86,24 +84,25 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Override public void onUpdate() { super.onUpdate(); + + if(worldObj.isRemote) + return; + InvWithLocation inv = getSparkInventory(); if(inv == null) { - if(!worldObj.isRemote) - dropAndKill(); + dropAndKill(); return; } if(isMaster()) master = this; - if(worldObj.isRemote ? firstUpdateClient : firstUpdateServer) { + if(firstTick) { if(isMaster()) restartNetwork(); else findNetwork(); - if(worldObj.isRemote) - firstUpdateClient = false; - else firstUpdateServer = false; + firstTick = false; } if(master != null && (((Entity) master).isDead || master.getNetwork() != getNetwork())) @@ -125,7 +124,6 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { public void setDead() { super.setDead(); connections.remove(this); - connectionsClient.remove(this); restartNetwork(); } @@ -143,20 +141,16 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } this.master = master; - if(worldObj.isRemote) - connectionsClient = connections; - else this.connections = connections; + this.connections = connections; } - List getNearbySparks() { + private List getNearbySparks() { List ret = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(posX - SCAN_RANGE, posY - SCAN_RANGE, posZ - SCAN_RANGE, posX + SCAN_RANGE, posY + SCAN_RANGE, posZ + SCAN_RANGE), Predicates.instanceOf(ICorporeaSpark.class)); return ((List) ret); } - void restartNetwork() { - if(worldObj.isRemote) - connectionsClient = new ArrayList<>(); - else connections = new ArrayList<>(); + private void restartNetwork() { + connections = new ArrayList<>(); relatives = new ArrayList<>(); if(master != null) { @@ -167,7 +161,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } } - void findNetwork() { + private void findNetwork() { List sparks = getNearbySparks(); if(sparks.size() > 0) { for(ICorporeaSpark spark : sparks) @@ -183,18 +177,18 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } } - void displayRelatives(ArrayList checked, ICorporeaSpark spark) { + private static void displayRelatives(EntityPlayer player, List checked, ICorporeaSpark spark) { if(spark == null) return; List sparks = spark.getRelatives(); if(sparks.isEmpty()) - EntitySpark.particleBeam((Entity) spark, (Entity) spark.getMaster()); + EntitySpark.particleBeam(player, (Entity) spark, (Entity) spark.getMaster()); else for(ICorporeaSpark endSpark : sparks) { if(!checked.contains(endSpark)) { - EntitySpark.particleBeam((Entity) spark, (Entity) endSpark); + EntitySpark.particleBeam(player, (Entity) spark, (Entity) endSpark); checked.add(endSpark); - displayRelatives(checked, endSpark); + displayRelatives(player, checked, endSpark); } } } @@ -209,7 +203,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Override public List getConnections() { - return worldObj.isRemote ? connectionsClient : connections; + return connections; } @Override @@ -275,29 +269,30 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { if(stack != null) { if(stack.getItem() == ModItems.twigWand) { if(player.isSneaking()) { - if(!player.worldObj.isRemote) + if(!player.worldObj.isRemote) { dropAndKill(); - if(isMaster()) - restartNetwork(); - if(player.worldObj.isRemote) - player.swingArm(hand); + if(isMaster()) + restartNetwork(); + } else player.swingArm(hand); return true; } else { - displayRelatives(new ArrayList<>(), master); + if(!player.worldObj.isRemote) { + displayRelatives(player, new ArrayList<>(), master); + } return true; } } else if(stack.getItem() == ModItems.dye) { int color = stack.getItemDamage(); if(color != getNetwork().getMetadata()) { - setNetwork(EnumDyeColor.byMetadata(color)); + if(!worldObj.isRemote) { + setNetwork(EnumDyeColor.byMetadata(color)); - if(master != null) - restartNetwork(); - else findNetwork(); + if(master != null) + restartNetwork(); + else findNetwork(); - stack.stackSize--; - if(player.worldObj.isRemote) - player.swingArm(hand); + stack.stackSize--; + } else player.swingArm(hand); } } } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 7500166d3..562a45cc1 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -12,8 +12,10 @@ package vazkii.botania.common.entity; import baubles.common.lib.PlayerHandler; import gnu.trove.map.hash.TObjectIntHashMap; +import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; @@ -215,9 +217,9 @@ public class EntitySpark extends Entity implements ISparkEntity { getEntityId(), e.getEntityId())); } - public static void particleBeam(Entity e1, Entity e2) { + public static void particleBeam(EntityPlayer player, Entity e1, Entity e2) { if(e1 != null && e2 != null && !e1.worldObj.isRemote) { - PacketHandler.sendToNearby(e1.worldObj, e1, + PacketHandler.sendTo(((EntityPlayerMP) player), new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.SPARK_NET_INDICATOR, e1.posX, e1.posY, e1.posZ, e1.getEntityId(), e2.getEntityId())); } @@ -258,7 +260,7 @@ public class EntitySpark extends Entity implements ISparkEntity { } else { List allSparks = SparkHelper.getSparksAround(worldObj, posX, posY, posZ); for(ISparkEntity spark : allSparks) - particleBeam(this, (Entity) spark); + particleBeam(player, this, (Entity) spark); return true; } } else if(stack.getItem() == ModItems.sparkUpgrade && upgrade == SparkUpgradeType.NONE) { From 878c0dbeba7da85b536e2a5451f540cf4ec8f8f3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 14 Aug 2016 10:45:40 -0500 Subject: [PATCH 31/37] Make ender hand less desyncy and clean some old filesy --- .../client/model/ModelBlackHoleCube.java | 102 ------------------ .../client/model/ModelSkullOverride.java | 50 --------- .../botania/common/item/ItemEnderHand.java | 16 +-- 3 files changed, 9 insertions(+), 159 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java delete mode 100644 src/main/java/vazkii/botania/client/model/ModelSkullOverride.java diff --git a/src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java b/src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java deleted file mode 100644 index 56ff033e7..000000000 --- a/src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java +++ /dev/null @@ -1,102 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [? (GMT)] - */ -package vazkii.botania.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -public class ModelBlackHoleCube extends ModelBase { - public final ModelRenderer shape1; - public final ModelRenderer shape1_1; - public final ModelRenderer shape1_2; - public final ModelRenderer shape1_3; - public final ModelRenderer shape1_4; - public final ModelRenderer shape1_5; - public final ModelRenderer shape1_6; - public final ModelRenderer shape1_7; - public final ModelRenderer shape1_8; - public final ModelRenderer shape1_9; - public final ModelRenderer shape1_10; - public final ModelRenderer shape1_11; - - public ModelBlackHoleCube() { - textureWidth = 36; - textureHeight = 2; - shape1_3 = new ModelRenderer(this, 0, 0); - shape1_3.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_3.addBox(-7.0F, 7.0F, -8.0F, 14, 1, 1, 0.0F); - setRotateAngle(shape1_3, 0.0F, 1.5707963267948966F, 0.0F); - shape1_7 = new ModelRenderer(this, 0, 0); - shape1_7.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_7.addBox(-7.0F, -8.0F, -8.0F, 14, 1, 1, 0.0F); - setRotateAngle(shape1_7, 0.0F, 1.5707963267948966F, 0.0F); - shape1_9 = new ModelRenderer(this, 0, 0); - shape1_9.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_9.addBox(-7.0F, 7.0F, 7.0F, 14, 1, 1, 0.0F); - setRotateAngle(shape1_9, 0.0F, 3.141592653589793F, 1.5707963267948966F); - shape1_11 = new ModelRenderer(this, 0, 0); - shape1_11.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_11.addBox(-7.0F, 7.0F, -8.0F, 14, 1, 1, 0.0F); - setRotateAngle(shape1_11, 0.0F, 3.141592653589793F, 1.5707963267948966F); - shape1 = new ModelRenderer(this, 0, 0); - shape1.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1.addBox(-8.0F, 7.0F, 7.0F, 16, 1, 1, 0.0F); - shape1_4 = new ModelRenderer(this, 0, 0); - shape1_4.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_4.addBox(-8.0F, 7.0F, -8.0F, 16, 1, 1, 0.0F); - shape1_8 = new ModelRenderer(this, 0, 0); - shape1_8.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_8.addBox(-7.0F, -8.0F, -8.0F, 14, 1, 1, 0.0F); - setRotateAngle(shape1_8, 0.0F, 3.141592653589793F, 1.5707963267948966F); - shape1_2 = new ModelRenderer(this, 0, 0); - shape1_2.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_2.addBox(-8.0F, -8.0F, -8.0F, 16, 1, 1, 0.0F); - shape1_1 = new ModelRenderer(this, 0, 0); - shape1_1.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_1.addBox(-8.0F, -8.0F, 7.0F, 16, 1, 1, 0.0F); - shape1_6 = new ModelRenderer(this, 0, 0); - shape1_6.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_6.addBox(-7.0F, -8.0F, -8.0F, 14, 1, 1, 0.0F); - setRotateAngle(shape1_6, 0.0F, -1.5707963267948966F, 0.0F); - shape1_10 = new ModelRenderer(this, 0, 0); - shape1_10.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_10.addBox(-7.0F, -8.0F, 7.0F, 14, 1, 1, 0.0F); - setRotateAngle(shape1_10, 0.0F, 3.141592653589793F, 1.5707963267948966F); - shape1_5 = new ModelRenderer(this, 0, 0); - shape1_5.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_5.addBox(-7.0F, 7.0F, -8.0F, 14, 1, 1, 0.0F); - setRotateAngle(shape1_5, 0.0F, -1.5707963267948966F, 0.0F); - } - - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - shape1_3.render(f5); - shape1_7.render(f5); - shape1_9.render(f5); - shape1_11.render(f5); - shape1.render(f5); - shape1_4.render(f5); - shape1_8.render(f5); - shape1_2.render(f5); - shape1_1.render(f5); - shape1_6.render(f5); - shape1_10.render(f5); - shape1_5.render(f5); - } - - - public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } -} diff --git a/src/main/java/vazkii/botania/client/model/ModelSkullOverride.java b/src/main/java/vazkii/botania/client/model/ModelSkullOverride.java deleted file mode 100644 index 1ad6c4258..000000000 --- a/src/main/java/vazkii/botania/client/model/ModelSkullOverride.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [? (GMT)] - */ -package vazkii.botania.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -public class ModelSkullOverride extends ModelBase { - - private final ModelRenderer bipedHead; - private final ModelRenderer bipedHeadwear; - - public ModelSkullOverride() { - textureWidth = 64; - textureHeight = 32; - bipedHead = new ModelRenderer(this, 0, 0); - bipedHead.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, 0F); - bipedHead.setRotationPoint(0.0F, 0.0F, 0.0F); - bipedHeadwear = new ModelRenderer(this, 32, 0); - bipedHeadwear.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, 0.5F); - bipedHeadwear.setRotationPoint(0.0F, 0.0F, 0.0F); - } - - public void renderWithoutRotation(float par1) { - bipedHead.render(par1); - bipedHeadwear.render(par1); - } - - @Override - public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) { - setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity); - bipedHead.render(par7); - bipedHeadwear.render(par7); - } - - @Override - public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6, Entity par7Entity) { - bipedHead.rotateAngleY = bipedHeadwear.rotateAngleY = par4 / (180F / (float)Math.PI); - bipedHead.rotateAngleX = bipedHeadwear.rotateAngleX = par5 / (180F / (float)Math.PI); - } -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java index cbc2c6606..b26a2a3ff 100644 --- a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java +++ b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java @@ -44,20 +44,22 @@ public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProv @Override public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(ManaItemHandler.requestManaExact(stack, player, COST_SELF, false)) { - player.displayGUIChest(player.getInventoryEnderChest()); + if(!player.worldObj.isRemote) + player.displayGUIChest(player.getInventoryEnderChest()); ManaItemHandler.requestManaExact(stack, player, COST_SELF, true); - world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.PLAYERS, 1F, 1F); + player.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1F, 1F); return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } return ActionResult.newResult(EnumActionResult.PASS, stack); } @Override - public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer iplayer, EntityLivingBase entity, EnumHand hand) { - if(ConfigHandler.enderPickpocketEnabled && entity instanceof EntityPlayer && ManaItemHandler.requestManaExact(stack, iplayer, COST_OTHER, false)) { - iplayer.displayGUIChest(((EntityPlayer) entity).getInventoryEnderChest()); - ManaItemHandler.requestManaExact(stack, iplayer, COST_OTHER, true); - entity.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1F, 1F); + public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) { + if(ConfigHandler.enderPickpocketEnabled && entity instanceof EntityPlayer && ManaItemHandler.requestManaExact(stack, player, COST_OTHER, false)) { + if(!player.worldObj.isRemote) + player.displayGUIChest(((EntityPlayer) entity).getInventoryEnderChest()); + ManaItemHandler.requestManaExact(stack, player, COST_OTHER, true); + player.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1F, 1F); return true; } From 4f26ea98932c8f7b0bda45b939b02f769f82c493 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 14 Aug 2016 11:46:45 -0500 Subject: [PATCH 32/37] Use vanilla mechanisms to sync TE's instead of rolling own --- .../api/internal/VanillaPacketDispatcher.java | 20 +++---------------- .../common/block/mana/BlockEnchanter.java | 14 ++++++++----- .../common/block/tile/TileEnchanter.java | 2 +- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index 3c7992ea9..6d66580ed 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -10,6 +10,7 @@ */ package vazkii.botania.api.internal; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.play.server.SPacketUpdateTileEntity; @@ -21,23 +22,8 @@ import net.minecraft.world.WorldServer; public final class VanillaPacketDispatcher { public static void dispatchTEToNearbyPlayers(TileEntity tile) { - if(tile.getWorld() instanceof WorldServer) { - WorldServer ws = ((WorldServer) tile.getWorld()); - SPacketUpdateTileEntity packet = tile.getUpdatePacket(); - - if(packet == null) - return; - - for (EntityPlayer player : ws.playerEntities) { - EntityPlayerMP playerMP = ((EntityPlayerMP) player); - - if (playerMP.getDistanceSq(tile.getPos()) < 64 * 64 - && ws.getPlayerChunkMap().isPlayerWatchingChunk(playerMP, tile.getPos().getX() >> 4, tile.getPos().getZ() >> 4)) { - playerMP.connection.sendPacket(packet); - } - } - - } + IBlockState state = tile.getWorld().getBlockState(tile.getPos()); + tile.getWorld().notifyBlockUpdate(tile.getPos(), state, state, 8); } public static void dispatchTEToNearbyPlayers(World world, BlockPos pos) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 936c8a790..7bb39abdb 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -31,12 +31,14 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.handler.ModelHandler; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.item.ModItems; @@ -112,7 +114,10 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, if(stack != null && stack.getItem() == ModItems.twigWand) return false; - boolean stackEnchantable = stack != null && stack.getItem() != Items.BOOK && stack.isItemEnchantable() && stack.stackSize == 1 && stack.getItem().getItemEnchantability(stack) > 0; + boolean stackEnchantable = stack != null + && stack.getItem() != Items.BOOK + && stack.isItemEnchantable() + && stack.stackSize == 1; if(enchanter.itemToEnchant == null) { if(stackEnchantable) { @@ -121,10 +126,9 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, enchanter.sync(); } } else if(enchanter.stage == TileEnchanter.State.IDLE) { - if(player.inventory.addItemStackToInventory(enchanter.itemToEnchant.copy())) { - enchanter.itemToEnchant = null; - enchanter.sync(); - } else player.addChatMessage(new TextComponentTranslation("botaniamisc.invFull")); + ItemHandlerHelper.giveItemToPlayer(player, enchanter.itemToEnchant.copy()); + enchanter.itemToEnchant = null; + enchanter.sync(); } return true; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 29e819e83..75f9351c2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -371,7 +371,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } private boolean isEnchantmentValid(Enchantment ench) { - if(!ench.canApply(itemToEnchant) || !ench.type.canEnchantItem(itemToEnchant.getItem())) + if(!ench.canApply(itemToEnchant)) return false; for(EnchantmentData data : enchants) { From 9e13eda148a157b4231cddfe0406726eca4f89aa Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 15 Aug 2016 12:00:51 -0500 Subject: [PATCH 33/37] Add missing sideonly to blocks --- src/main/java/vazkii/botania/api/wand/IWandHUD.java | 3 +++ src/main/java/vazkii/botania/common/block/BlockAltGrass.java | 2 ++ src/main/java/vazkii/botania/common/block/BlockAltar.java | 2 ++ src/main/java/vazkii/botania/common/block/BlockBifrost.java | 3 +++ .../java/vazkii/botania/common/block/BlockBifrostPerm.java | 3 +++ src/main/java/vazkii/botania/common/block/BlockCamo.java | 1 - .../botania/common/block/BlockFloatingSpecialFlower.java | 1 + .../java/vazkii/botania/common/block/BlockHourglass.java | 1 + .../java/vazkii/botania/common/block/BlockLightRelay.java | 1 + .../java/vazkii/botania/common/block/BlockLivingrock.java | 1 + .../java/vazkii/botania/common/block/BlockLivingwood.java | 1 + .../java/vazkii/botania/common/block/BlockModFlower.java | 2 ++ .../java/vazkii/botania/common/block/BlockOpenCrate.java | 2 ++ src/main/java/vazkii/botania/common/block/BlockPlatform.java | 1 + src/main/java/vazkii/botania/common/block/BlockPylon.java | 1 + .../java/vazkii/botania/common/block/BlockSpecialFlower.java | 3 +++ src/main/java/vazkii/botania/common/block/BlockStorage.java | 1 + .../vazkii/botania/common/block/decor/BlockBuriedPetals.java | 1 + .../vazkii/botania/common/block/decor/BlockCustomBrick.java | 1 + .../vazkii/botania/common/block/decor/BlockManaBeacon.java | 1 + .../vazkii/botania/common/block/decor/BlockManaFlame.java | 2 +- .../vazkii/botania/common/block/decor/BlockManaGlass.java | 4 ++++ .../vazkii/botania/common/block/decor/BlockPavement.java | 1 + .../vazkii/botania/common/block/decor/BlockPetalBlock.java | 1 + .../vazkii/botania/common/block/decor/BlockStarfield.java | 3 +++ .../vazkii/botania/common/block/decor/BlockTinyPotato.java | 1 + .../vazkii/botania/common/block/decor/BlockUnstable.java | 1 + .../common/block/decor/biomestone/BlockBiomeStone.java | 3 +++ .../botania/common/block/decor/panes/BlockAlfglassPane.java | 1 + .../botania/common/block/decor/panes/BlockBifrostPane.java | 1 + .../botania/common/block/decor/panes/BlockManaglassPane.java | 1 + .../common/block/decor/walls/BlockBiomeStoneWall.java | 1 + .../botania/common/block/decor/walls/BlockModWall.java | 1 + .../java/vazkii/botania/common/block/mana/BlockBrewery.java | 1 + .../vazkii/botania/common/block/mana/BlockEnchanter.java | 1 + .../vazkii/botania/common/block/mana/BlockForestDrum.java | 1 + .../java/vazkii/botania/common/block/mana/BlockPool.java | 1 + .../java/vazkii/botania/common/block/mana/BlockPrism.java | 2 +- .../java/vazkii/botania/common/block/mana/BlockSpreader.java | 5 ++--- .../vazkii/botania/common/block/mana/BlockTurntable.java | 3 +++ 40 files changed, 61 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/api/wand/IWandHUD.java b/src/main/java/vazkii/botania/api/wand/IWandHUD.java index 58f09e8f2..a61860877 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandHUD.java +++ b/src/main/java/vazkii/botania/api/wand/IWandHUD.java @@ -14,6 +14,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Any block that implements this has a HUD rendered when being hovered @@ -21,6 +23,7 @@ import net.minecraft.world.World; */ public interface IWandHUD { + @SideOnly(Side.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 1a0530836..7abc27085 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -82,6 +82,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 6; i++) @@ -120,6 +121,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { return type == EnumPlantType.Plains || type == EnumPlantType.Beach; } + @SideOnly(Side.CLIENT) @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random r) { if (state.getBlock() != this) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 2a6205f55..8907a0475 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -110,6 +110,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { return state; } + @SideOnly(Side.CLIENT) @Nonnull @Override public BlockRenderLayer getBlockLayer() { @@ -121,6 +122,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 9; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 9c600aaa4..4838ec0b2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -24,6 +24,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.tile.TileBifrost; @@ -66,6 +68,7 @@ public class BlockBifrost extends BlockMod implements ILexiconable { return block != this && super.shouldSideBeRendered(state, world, pos, side); } + @SideOnly(Side.CLIENT) @Nonnull @Override public BlockRenderLayer getBlockLayer() { diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 4308299b4..4da885bd1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -20,6 +20,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.Botania; @@ -59,6 +61,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { Botania.proxy.sparkleFX(world, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); } + @SideOnly(Side.CLIENT) @Nonnull @Override public BlockRenderLayer getBlockLayer() { diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 376fe3437..4a0e58452 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -34,7 +34,6 @@ public abstract class BlockCamo extends BlockMod { } @Override - @SuppressWarnings("unchecked") public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack currentStack, EnumFacing side, float hitX, float hitY, float hitZ) { TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 815a99231..1585c73bc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -205,6 +205,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I ((TileSpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos, state); } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc, res); diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index a57912d38..fe0388941 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -191,6 +191,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, return false; } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { TileHourglass tile = (TileHourglass) world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 1122d1310..867aeb3df 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -88,6 +88,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 1948c3fef..7b37454b6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -76,6 +76,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < LivingRockVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index 00df2c3bd..b73585ed5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -80,6 +80,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < LivingWoodVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 1d23e582f..43637b05f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -118,6 +118,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup return true; } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull List stacks) { for(int i = 0; i < 16; i++) @@ -129,6 +130,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup return getMetaFromState(state); } + @SideOnly(Side.CLIENT) @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 12827d7b7..8650a249c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -101,6 +101,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < CrateVariant.values().length; i++) @@ -156,6 +157,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, return crate.onWanded(world, player, stack); } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 3725d77d1..631255db1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -112,6 +112,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < PlatformVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index ba0caa08f..ffeed4772 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -93,6 +93,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi return getMetaFromState(state); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { for(int i = 0; i < PylonVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 7c0f54500..b6067f512 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -204,12 +204,14 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I return true; } + @SideOnly(Side.CLIENT) @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.CUTOUT; } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull List stacks) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { @@ -336,6 +338,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, stack, side, hitX, hitY, hitZ); } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc, res); diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 18660b9c6..48b4789c1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -66,6 +66,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.values()[meta]); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { for(int i = 0; i < StorageVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 2ccbe8ee7..e5f5f8a79 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -46,6 +46,7 @@ public class BlockBuriedPetals extends BlockModFlower { return AABB; } + @SideOnly(Side.CLIENT) @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { EnumDyeColor color = state.getValue(BotaniaStateProps.COLOR); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java index d189bf730..726a56a27 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -77,6 +77,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < CustomBrickVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java index 177a4d448..a1249cfd0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -80,6 +80,7 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { return AABB; } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index 9bda6cca4..feb059682 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -91,7 +91,7 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { @Override public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { - return null; + return NULL_AABB; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java index 66cba1f49..2d89cdab2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -21,6 +21,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; @@ -47,12 +49,14 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { return false; } + @SideOnly(Side.CLIENT) @Override public boolean shouldSideBeRendered(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { Block block = world.getBlockState(pos.offset(side)).getBlock(); return block == this ? false : super.shouldSideBeRendered(state, world, pos, side); } + @SideOnly(Side.CLIENT) @Nonnull @Override public BlockRenderLayer getBlockLayer() { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java index 66bb3769d..aa95fb27b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -95,6 +95,7 @@ public class BlockPavement extends BlockMod { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < TYPES; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index d79a8f01d..d37930c6f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -67,6 +67,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index 6df572ab1..29938d8cf 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -22,6 +22,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -50,6 +52,7 @@ public class BlockStarfield extends BlockMod implements ILexiconable { return AABB; } + @SideOnly(Side.CLIENT) @Nonnull @Override public BlockRenderLayer getBlockLayer() { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index 5e9f97d89..254d2b774 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -95,6 +95,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { public void registerItemForm() { GameRegistry.register(new ItemBlockTinyPotato(this), getRegistryName()); } + @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9) { TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java index e6dcc0360..d79ce9cd3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -83,6 +83,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { return AABB; } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java index 8c54d3ff8..8be058bce 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java @@ -21,6 +21,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; @@ -39,6 +41,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { setSoundType(SoundType.STONE); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java index ff6db6a28..c5286035d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java @@ -24,6 +24,7 @@ public class BlockAlfglassPane extends BlockModPane { super(ModBlocks.elfGlass); } + @SideOnly(Side.CLIENT) @Nonnull @Override public BlockRenderLayer getBlockLayer() { diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java index 5c8361ebb..d5d42dd65 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java @@ -24,6 +24,7 @@ public class BlockBifrostPane extends BlockModPane { super(ModBlocks.bifrostPerm); } + @SideOnly(Side.CLIENT) @Nonnull @Override public BlockRenderLayer getBlockLayer() { diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java index 0f6b30830..09e2d4a16 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java @@ -24,6 +24,7 @@ public class BlockManaglassPane extends BlockModPane { super(ModBlocks.manaGlass); } + @SideOnly(Side.CLIENT) @Nonnull @Override public BlockRenderLayer getBlockLayer() { diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index b640df5b6..f1ac50cea 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -72,6 +72,7 @@ public class BlockBiomeStoneWall extends BlockModWall { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List list) { for(int i = 0; i < 8; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index c278f7ff1..5e921e833 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -99,6 +99,7 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable, IM GameRegistry.register(new ItemBlockMod(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List list) { list.add(new ItemStack(item)); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index 6af9a2c67..14e2acd96 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -150,6 +150,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { return LexiconData.brewery; } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileBrewery) world.getTileEntity(pos)).renderHUD(mc, res); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 7bb39abdb..1736f1d65 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -179,6 +179,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, return LexiconData.manaEnchanting; } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileEnchanter) world.getTileEntity(pos)).renderHUD(res); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index d97c22040..4dae7d5f1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -108,6 +108,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona return state.getBlock().getMetaFromState(state); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 3; i++) diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 1588489c8..7ebd19f51 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -140,6 +140,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return drops; } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { par3.add(new ItemStack(item, 1, 0)); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index 14a2cd9bf..c5b0628e1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -97,7 +97,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, @Override public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { - return null; + return NULL_AABB; } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index d1cc52fd5..6f40cc2c4 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -87,6 +87,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { for(int i = 0; i < 4; i++) @@ -233,9 +234,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex @Override public AxisAlignedBB getWireframeAABB(World world, BlockPos pos) { - float f = 1F / 16F; - return new AxisAlignedBB(pos.getX() + f, pos.getY() + f, pos.getZ() + f, - pos.getX() + 1 - f, pos.getY() + 1 - f, pos.getZ() + 1 - f); + return FULL_BLOCK_AABB.offset(pos).contract(1.0/16.0); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java index e78a655b2..b7f42b3c0 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -21,6 +21,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandHUD; @@ -51,6 +53,7 @@ public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILe return new TileTurntable(); } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileTurntable) world.getTileEntity(pos)).renderHUD(mc, res); From ba3f337520fca13d497c247b4e66b8e3551b8ec7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 15 Aug 2016 12:11:51 -0500 Subject: [PATCH 34/37] Remove moss stone botaina recipe, remove old tooltips --- .../vazkii/botania/client/core/handler/TooltipHandler.java | 6 ------ .../java/vazkii/botania/common/core/BotaniaCreativeTab.java | 1 - .../vazkii/botania/common/crafting/ModCraftingRecipes.java | 5 ----- .../java/vazkii/botania/common/lexicon/LexiconData.java | 3 +-- src/main/resources/assets/botania/lang/en_US.lang | 4 ---- src/main/resources/assets/botania/lang/es_AR.lang | 1 - src/main/resources/assets/botania/lang/es_ES.lang | 4 ---- src/main/resources/assets/botania/lang/fr_FR.lang | 3 --- src/main/resources/assets/botania/lang/ja_JP.lang | 5 +---- src/main/resources/assets/botania/lang/ko_KR.lang | 3 --- src/main/resources/assets/botania/lang/nl_NL.lang | 4 ---- src/main/resources/assets/botania/lang/pt_BR.lang | 3 --- src/main/resources/assets/botania/lang/ru_RU.lang | 3 --- src/main/resources/assets/botania/lang/zh_CN.lang | 4 ---- src/main/resources/assets/botania/lang/zh_TW.lang | 4 ---- 15 files changed, 2 insertions(+), 51 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java index 57199cec6..8394b13ed 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -24,12 +24,6 @@ public final class TooltipHandler { @SubscribeEvent(priority = EventPriority.HIGHEST) public static void onTooltipEvent(ItemTooltipEvent event) { - if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.DIRT) && event.getItemStack().getItemDamage() == 1) { - event.getToolTip().add(I18n.format("botaniamisc.coarseDirt0")); - event.getToolTip().add(I18n.format("botaniamisc.coarseDirt1")); - } else if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.MOB_SPAWNER) && event.getEntityPlayer().capabilities.isCreativeMode) - event.getToolTip().add(I18n.format("botaniamisc.spawnerTip")); - if(ItemNBTHelper.detectNBT(event.getItemStack()) && ItemNBTHelper.getBoolean(event.getItemStack(), ItemRegenIvy.TAG_REGEN, false)) event.getToolTip().add(I18n.format("botaniamisc.hasIvy")); if(ItemNBTHelper.detectNBT(event.getItemStack()) && ItemNBTHelper.getBoolean(event.getItemStack(), ItemKeepIvy.TAG_KEEP, false)) diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 8d0fd68f9..3007a4da1 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -301,7 +301,6 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.manaBeacon); addItem(ModItems.signalFlare); - addStack(new ItemStack(Blocks.DIRT, 1, 1)); addBlock(ModBlocks.dirtPath); addBlock(ModFluffBlocks.dirtPathSlab); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 5abea5661..d8236f92e 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -167,7 +167,6 @@ public final class ModCraftingRecipes { public static IRecipe recipeFireRod; public static IRecipe recipeVineBall; public static IRecipe recipeSlingshot; - public static IRecipe recipeMossStone; public static IRecipe recipeLensInfluence; public static IRecipe recipeLensWeight; public static IRecipe recipeLensPaint; @@ -1118,10 +1117,6 @@ public final class ModCraftingRecipes { 'A', LibOreDict.RUNE[3]); recipeSlingshot = BotaniaAPI.getLatestAddedRecipe(); - // Moss Stone Recipe - addShapelessOreDictRecipe(new ItemStack(Blocks.MOSSY_COBBLESTONE), "cobblestone", new ItemStack(ModItems.vineBall)); - recipeMossStone = BotaniaAPI.getLatestAddedRecipe(); - // Influence Lens Recipe addOreDictRecipe(new ItemStack(ModItems.lens, 1, 12), "PRP", "PLP", "PPP", diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 7dc56c75b..057675bec 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -945,8 +945,7 @@ public final class LexiconData { vineBall = new BasicLexiconEntry(LibLexicon.TOOL_VINE_BALL, categoryTools); vineBall.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeVineBall), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeSlingshot), - new PageCraftingRecipe("4", ModCraftingRecipes.recipeMossStone)); + new PageCraftingRecipe("3", ModCraftingRecipes.recipeSlingshot)); laputaShard = new AlfheimLexiconEntry(LibLexicon.TOOL_LAPUTA_SHARD, categoryTools); laputaShard.setLexiconPages(new PageText("0"), new PageText("2"), diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index ad1ce0a2d..de44542c6 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -58,9 +58,6 @@ botaniamisc.shiftToRemove=Shift-click to remove botaniamisc.clickToAdd=Add Bookmark botaniamisc.ratio=%sx Zoom (hover to zoom out) botaniamisc.bottleTooltip=It has an acquired taste -botaniamisc.coarseDirt0=Coarse Dirt, grass -botaniamisc.coarseDirt1=won't grow on it -botaniamisc.spawnerTip=Tip: Use a Spawn Egg to change the mob botaniamisc.shardLevel=Shard Power %s botaniamisc.lexiconIndex=Lexicon Index botaniamisc.hasIvy=Has Timeless Ivy @@ -2977,7 +2974,6 @@ botania.page.vineBall0=&1Ladders&0 can't stand up on their own, they require som botania.page.vineBall1=It's also possible, by combining some materials such as &1Livingwood&0 or a &1Rune of Air&0 to create a slingshot that lets these &1Vine Balls&0 be shot while completely ignoring the force of gravity. botania.page.vineBall2=This would be in Vineacraft... botania.page.vineBall3=...if that actually existed. -botania.page.vineBall4=Oh, and you can make &1Moss Stone&0 too # -- SHARD OF LAPUTA botania.entry.laputaShard=Shard of Laputa diff --git a/src/main/resources/assets/botania/lang/es_AR.lang b/src/main/resources/assets/botania/lang/es_AR.lang index 271cefebe..bab3bc81f 100644 --- a/src/main/resources/assets/botania/lang/es_AR.lang +++ b/src/main/resources/assets/botania/lang/es_AR.lang @@ -51,7 +51,6 @@ botaniamisc.shiftToRemove=Shift + click para quitar botaniamisc.clickToAdd=Click para añadir un señalador aquí botaniamisc.ratio=%s:1 Ratio botaniamisc.bottleTooltip=Ha adquirido gusto -botaniamisc.spawnerTip=Tip: Usa un huevo de spawn para cambiar el mob botaniamisc.shardLevel=Shard Power %s botaniamisc.lexiconIndex=Índice del Lexicon diff --git a/src/main/resources/assets/botania/lang/es_ES.lang b/src/main/resources/assets/botania/lang/es_ES.lang index cd8d93f2a..a327a1ba5 100644 --- a/src/main/resources/assets/botania/lang/es_ES.lang +++ b/src/main/resources/assets/botania/lang/es_ES.lang @@ -54,9 +54,6 @@ botaniamisc.shiftToRemove=Shift-clic para quitar botaniamisc.clickToAdd=Añadir marcador botaniamisc.ratio=Zoom: %sx botaniamisc.bottleTooltip=Tiene un gusto refinado -botaniamisc.coarseDirt0=Tierra basta, la hierba -botaniamisc.coarseDirt1=no crece sobre ella -botaniamisc.spawnerTip=Consejo: Usa un huevo de engendrar para cambiar la criatura botaniamisc.shardLevel=Potencia de lasca %s botaniamisc.lexiconIndex=Índice del lexicón botaniamisc.hasIvy=Tiene hiedra eterna @@ -2266,7 +2263,6 @@ botania.page.vineBall0=Las &1escaleras de mano&0 no se sostienen por si sola, ha botania.page.vineBall1=También es posible combinando algunos materiales tales como &1madera viviente&0 o una &1runa de aire&0 crear un tirachinas que permite arrojar estas &1bolas de enredadera&0 ignorando completamente la fuerza de gravedad. botania.page.vineBall2=Así sería en Enredacraft... botania.page.vineBall3=...si en realidad existiese. -botania.page.vineBall4=Oh, y se puede hace &1piedra musgosa&0 también # -- SHARD OF LAPUTA botania.entry.laputaShard=Lasca de Laputa diff --git a/src/main/resources/assets/botania/lang/fr_FR.lang b/src/main/resources/assets/botania/lang/fr_FR.lang index 7605cbd41..5062906d1 100644 --- a/src/main/resources/assets/botania/lang/fr_FR.lang +++ b/src/main/resources/assets/botania/lang/fr_FR.lang @@ -54,9 +54,6 @@ botaniamisc.shiftToRemove=Maj-cliquez pour retirer botaniamisc.clickToAdd=Marquez la page botaniamisc.ratio=Zoom: %sx botaniamisc.bottleTooltip=Il a un goût d'acquis -botaniamisc.coarseDirt0=terre grossière, l'herbe -botaniamisc.coarseDirt1=ne poussera pas dessus -botaniamisc.spawnerTip=Aide: utilisez un oeuf pour changer la créature botaniamisc.shardLevel=Puissance d'éclat %s botaniamisc.lexiconIndex=Index du lexique botaniamisc.hasIvy=A lierre éternel diff --git a/src/main/resources/assets/botania/lang/ja_JP.lang b/src/main/resources/assets/botania/lang/ja_JP.lang index bf4a1b933..bdcab5d5d 100644 --- a/src/main/resources/assets/botania/lang/ja_JP.lang +++ b/src/main/resources/assets/botania/lang/ja_JP.lang @@ -50,10 +50,7 @@ botaniamisc.clickToSee=クリックで読む botaniamisc.shiftToRemove=シフト+クリックでお気に入りから外す botaniamisc.clickToAdd=お気に入りに追加 botaniamisc.ratio=%sx 拡大(カーソルで拡大解除) -botaniamisc.bottleTooltip=慣れ親しんだ味 -botaniamisc.coarseDirt0=きめの粗い土 -botaniamisc.coarseDirt1=草が伝播しない -botaniamisc.spawnerTip=Tip: スポーンエッグを使うとモブを変えられる +botaniamisc.bottleTooltip=慣れ親しんだ味 botaniamisc.shardLevel=シャードパワー %s botaniamisc.lexiconIndex=索引 botaniamisc.hasIvy=Has Timeless Ivy diff --git a/src/main/resources/assets/botania/lang/ko_KR.lang b/src/main/resources/assets/botania/lang/ko_KR.lang index a6ddd8074..b668775d6 100644 --- a/src/main/resources/assets/botania/lang/ko_KR.lang +++ b/src/main/resources/assets/botania/lang/ko_KR.lang @@ -54,9 +54,6 @@ botaniamisc.clickToSee=클릭시 해당페이지 이동 botaniamisc.shiftToRemove=쉬프트클릭시 삭제 botaniamisc.clickToAdd=이곳을 누르면 북마크가 추가됩니다. botaniamisc.ratio=확대: %sx -botaniamisc.coarseDirt0=거친 흙과 잔디 위에서는 -botaniamisc.coarseDirt1=아무것도 자랄 수 없습니다 -botaniamisc.spawnerTip=Tip: 스폰알로 몹을 변경 botaniamisc.shardLevel=%s 등급 botaniamisc.lexiconIndex=목차 botaniamisc.hasIvy=시대를 초월한 담쟁이 덩굴 diff --git a/src/main/resources/assets/botania/lang/nl_NL.lang b/src/main/resources/assets/botania/lang/nl_NL.lang index 65d0b5b66..0b01c62b6 100644 --- a/src/main/resources/assets/botania/lang/nl_NL.lang +++ b/src/main/resources/assets/botania/lang/nl_NL.lang @@ -56,9 +56,6 @@ botaniamisc.shiftToRemove=Shift-klik om te verwijderen botaniamisc.clickToAdd=Favoriet toevoegen botaniamisc.ratio=Inzoomen: %sx botaniamisc.bottleTooltip=Het heeft een verworven smaak -botaniamisc.coarseDirt0=Grof Vuil, gras -botaniamisc.coarseDirt1=wil er niet op groeien -botaniamisc.spawnerTip=Tip: Gebruik een Spawn ei om de mob te wijzigen botaniamisc.shardLevel=Schervenkracht %s botaniamisc.lexiconIndex=Lexicon Index botaniamisc.hasIvy=Heeft Tijdloze Klimop @@ -2791,7 +2788,6 @@ botania.page.vineBall0=&1Ladders&0 kunnen niet op zichzelf staan, ze hebben iets botania.page.vineBall1=Het is ook mogelijk, middels combinatie van enkele materialen zoals &1Levenshout&0 of een &1Rune der Lucht&0, om een katapult te maken die de &1Lianenballen&0 kan afschieten zonder last te hebben van de zwaartekracht. botania.page.vineBall2=Dit zou bestaan in Vinecraft... botania.page.vineBall3=...als dat zou bestaan. -botania.page.vineBall4=Oh, en je kunt ook &1Mossige Steen&0 maken # -- SHARD OF LAPUTA botania.entry.laputaShard=Scherf van Laputa diff --git a/src/main/resources/assets/botania/lang/pt_BR.lang b/src/main/resources/assets/botania/lang/pt_BR.lang index a8fc0754e..e20467680 100644 --- a/src/main/resources/assets/botania/lang/pt_BR.lang +++ b/src/main/resources/assets/botania/lang/pt_BR.lang @@ -54,9 +54,6 @@ botaniamisc.shiftToRemove=Shiftclique para remover botaniamisc.clickToAdd=Adicionar Favorito botaniamisc.ratio=Zoom: %sx (passe o mouse para ver normal) botaniamisc.bottleTooltip=Desenvolveu um sabor -botaniamisc.coarseDirt0=Terra áspera, a grama -botaniamisc.coarseDirt1=não crescerá. -botaniamisc.spawnerTip=Dica: Use um ovo de Invocar para mudar o mob botaniamisc.shardLevel=Poder Cristalino %s botaniamisc.lexiconIndex=Índice do Léxico botaniamisc.hasIvy=Possui Hera Eterna diff --git a/src/main/resources/assets/botania/lang/ru_RU.lang b/src/main/resources/assets/botania/lang/ru_RU.lang index 79d8510e4..3233b26df 100644 --- a/src/main/resources/assets/botania/lang/ru_RU.lang +++ b/src/main/resources/assets/botania/lang/ru_RU.lang @@ -53,9 +53,6 @@ botaniamisc.shiftToRemove=Shift+ЛКМ, чтобы удалить botaniamisc.clickToAdd=Добавить закладку botaniamisc.ratio=Соотношение: %sx botaniamisc.bottleTooltip=Вкус на любителя -botaniamisc.coarseDirt0=Грубая земля, трава -botaniamisc.coarseDirt1=не будет расти на ней -botaniamisc.spawnerTip=Подсказка: Используйте яйцо призыва, чтобы сменить моба botaniamisc.shardLevel=Сила осколка %s botaniamisc.lexiconIndex=Оглавление Лексикона botaniamisc.hasIvy=С бессмертным плющом diff --git a/src/main/resources/assets/botania/lang/zh_CN.lang b/src/main/resources/assets/botania/lang/zh_CN.lang index ae0cdb139..ccdc21196 100644 --- a/src/main/resources/assets/botania/lang/zh_CN.lang +++ b/src/main/resources/assets/botania/lang/zh_CN.lang @@ -54,9 +54,6 @@ botaniamisc.shiftToRemove=Shift点击移除 botaniamisc.clickToAdd=点击添加书签 botaniamisc.ratio=放大:%s倍 botaniamisc.bottleTooltip=味道如何 -botaniamisc.coarseDirt0=劣质土,草 -botaniamisc.coarseDirt1=无法生长 -botaniamisc.spawnerTip=Tip:使用刷怪蛋改变怪物类型 botaniamisc.shardLevel=碎片能量 %s botaniamisc.lexiconIndex=辞典目录 botaniamisc.hasIvy=有永恒常春藤 @@ -2908,7 +2905,6 @@ botania.page.vineBall0=&1梯子&0不能独立存在,它们需要 有依附的东 botania.page.vineBall1=也可以用一些类似&1活木&0和&1风&0 &1之符文&0的材料制作一把能忽 视重力发射&1藤蔓球&0的弹弓. botania.page.vineBall2=这将会在Vineacraft出现.. botania.page.vineBall3=...如果那确实存在的话. -botania.page.vineBall4=哦,你也能制作&1苔石&0 # -- SHARD OF LAPUTA botania.entry.laputaShard=拉普达碎片 diff --git a/src/main/resources/assets/botania/lang/zh_TW.lang b/src/main/resources/assets/botania/lang/zh_TW.lang index 2f5b1b307..0d594d3df 100644 --- a/src/main/resources/assets/botania/lang/zh_TW.lang +++ b/src/main/resources/assets/botania/lang/zh_TW.lang @@ -54,9 +54,6 @@ botaniamisc.shiftToRemove=Shift點擊移除 botaniamisc.clickToAdd=點擊添加書籤 botaniamisc.ratio=放大:%s倍 botaniamisc.bottleTooltip=味道如何 -botaniamisc.coarseDirt0=劣質土,草 -botaniamisc.coarseDirt1=無法生長 -botaniamisc.spawnerTip=Tip:使用刷怪蛋改變怪物類型 botaniamisc.shardLevel=碎片能量 %s botaniamisc.lexiconIndex=辭典目錄 botaniamisc.hasIvy=有永恆常春籐 @@ -2917,7 +2914,6 @@ botania.page.vineBall0=&1梯子&0不能獨立存在,它們需要 有依附的東 botania.page.vineBall1=也可以用一些類似&1活木&0和&1風&0 &1之符文&0的材料製作一把能忽 視重力發射&1籐蔓球&0的彈弓. botania.page.vineBall2=這將會在Vineacraft出現.. botania.page.vineBall3=...如果那確實存在的話. -botania.page.vineBall4=哦,你也能製作&1苔石&0 # -- SHARD OF LAPUTA botania.entry.laputaShard=拉普達碎片 From a0a78ea2036871f6875d08c8194511e7052a3b47 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 15 Aug 2016 13:43:18 -0500 Subject: [PATCH 35/37] Build 316 --- build.properties | 8 ++++---- version/1.10.2.txt | 2 +- version/update.json | 7 ++++--- web/versions.ini | 3 ++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build.properties b/build.properties index bcf2bac3d..4b8e9d8d6 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Wed Aug 03 20:27:38 CDT 2016 +#Mon Aug 15 13:42:37 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -dir_repo=./ -mc_version=1.10.2 forge_version=12.18.1.2056 -build_number=316 +mc_version=1.10.2 +dir_repo=./ +build_number=317 mod_name=Botania diff --git a/version/1.10.2.txt b/version/1.10.2.txt index f936bbdf8..939fa0c04 100644 --- a/version/1.10.2.txt +++ b/version/1.10.2.txt @@ -1 +1 @@ -r1.8-315 \ No newline at end of file +r1.8-316 \ No newline at end of file diff --git a/version/update.json b/version/update.json index 3472c85be..454f412a5 100644 --- a/version/update.json +++ b/version/update.json @@ -6,7 +6,8 @@ "r1.8-312": "See https://github.com/williewillus/Botania/releases/r1.8-312", "r1.8-313": "See https://github.com/williewillus/Botania/releases/r1.8-313", "r1.8-314": "See https://github.com/williewillus/Botania/releases/r1.8-314", - "r1.8-315": "See https://github.com/williewillus/Botania/releases/r1.8-315" + "r1.8-315": "See https://github.com/williewillus/Botania/releases/r1.8-315", + "r1.8-316": "See https://github.com/williewillus/Botania/releases/r1.8-316" }, "1.9": { "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301", @@ -29,8 +30,8 @@ "promos": { "1.10-latest": "r1.8-311", "1.10-recommended": "r1.8-311", - "1.10.2-latest": "r1.8-315", - "1.10.2-recommended": "r1.8-315", + "1.10.2-latest": "r1.8-316", + "1.10.2-recommended": "r1.8-316", "1.9-latest": "r1.8-305", "1.9-recommended": "r1.8-305", "1.9.4-latest": "r1.8-313", diff --git a/web/versions.ini b/web/versions.ini index b01956212..ac1ae9a39 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -267,4 +267,5 @@ r1.8-312=1.10.2 r1.8-313=1.9.4 r1.8-313=1.10.2 r1.8-314=1.10.2 -r1.8-315=1.10.2 \ No newline at end of file +r1.8-315=1.10.2 +r1.8-316=1.10.2 \ No newline at end of file From 37eb1a781c2fa208804562665622dfb07964f2f4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 15 Aug 2016 15:34:06 -0500 Subject: [PATCH 36/37] Fix bergamute having a nonmatching color --- .../common/block/subtile/functional/SubTileBergamute.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java index 099392b34..69b374ad7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java @@ -45,7 +45,7 @@ public class SubTileBergamute extends SubTileFunctional { @Override public int getColor() { - return 0x1FCBFF; + return 0xF46C6C; } @Override From a0a742811639be0b13d61dd424a9859b6285d80e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 15 Aug 2016 15:52:51 -0500 Subject: [PATCH 37/37] Bergamute now blocks moving/ticking sounds. Closes #407 --- .../functional/BergamuteEventHandler.java | 37 +++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java index 2c290ee59..5674b1c19 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java @@ -1,6 +1,8 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.client.audio.ISound; +import net.minecraft.client.audio.ITickableSound; +import net.minecraft.client.audio.MovingSound; import net.minecraft.client.audio.Sound; import net.minecraft.client.audio.SoundEventAccessor; import net.minecraft.client.audio.SoundHandler; @@ -32,14 +34,18 @@ public class BergamuteEventHandler { ISound sound = evt.getResultSound(); if (sound != null && shouldSilence(sound.getCategory())) { - SubTileBergamute berg = SubTileBergamute.getBergamuteNearby(sound.getXPosF(), sound.getYPosF(), sound.getZPosF()); + if(sound instanceof ITickableSound) { + evt.setResultSound(new WrappedTickableSound((ITickableSound) sound, MULTIPLIER)); + } else { + SubTileBergamute berg = SubTileBergamute.getBergamuteNearby(sound.getXPosF(), sound.getYPosF(), sound.getZPosF()); - if (berg != null) { - evt.setResultSound(new WrappedSound(sound, MULTIPLIER)); + if (berg != null) { + evt.setResultSound(new WrappedSound(sound, MULTIPLIER)); - if (RAND.nextBoolean()) { - Color color = TilePool.PARTICLE_COLOR; - BotaniaAPI.internalHandler.sparkleFX(berg.getWorld(), berg.getPos().getX() + 0.3 + Math.random() * 0.5, berg.getPos().getY() + 0.5 + Math.random() * 0.5, berg.getPos().getZ() + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); + if (RAND.nextBoolean()) { + Color color = TilePool.PARTICLE_COLOR; + BotaniaAPI.internalHandler.sparkleFX(berg.getWorld(), berg.getPos().getX() + 0.3 + Math.random() * 0.5, berg.getPos().getY() + 0.5 + Math.random() * 0.5, berg.getPos().getZ() + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); + } } } } @@ -54,15 +60,18 @@ public class BergamuteEventHandler { private final ISound compose; private final float volMult; + private final boolean recheck; private WrappedSound(ISound toWrap, float volMult) { this.compose = toWrap; this.volMult = volMult; + this.recheck = toWrap instanceof MovingSound; } @Override public float getVolume() { - return compose.getVolume() * volMult; + float mult = recheck && SubTileBergamute.getBergamuteNearby(getXPosF(), getYPosF(), getZPosF()) == null ? 1F : volMult; + return compose.getVolume() * mult; } @Nonnull @Override public ResourceLocation getSoundLocation() { return compose.getSoundLocation(); } @@ -77,4 +86,18 @@ public class BergamuteEventHandler { @Override public float getZPosF() { return compose.getZPosF(); } @Nonnull @Override public AttenuationType getAttenuationType() { return compose.getAttenuationType(); } } + + @SideOnly(Side.CLIENT) + private static class WrappedTickableSound extends WrappedSound implements ITickableSound { + + private final ITickableSound compose; + + private WrappedTickableSound(ITickableSound toWrap, float volMult) { + super(toWrap, volMult); + this.compose = toWrap; + } + + @Override public boolean isDonePlaying() { return compose.isDonePlaying(); } + @Override public void update() { compose.update(); } + } }