From 05fe2c195cd8ce8c9e18383ee44b3f2d526d834f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 14 Feb 2020 20:56:28 -0600 Subject: [PATCH] Bump patchouli and forge, fix floating flower in world render --- build.gradle | 4 ++-- .../client/patchouli/component/ManaComponent.java | 8 ++++++-- .../component/RotatingItemListComponent.java | 10 ++++++++-- .../component/RotatingRecipeComponent.java | 10 +++++++--- .../patchouli/component/TerraPlateComponent.java | 15 ++++++++++----- .../render/tile/RenderTileFloatingFlower.java | 11 +++++++---- .../vazkii/botania/common/item/ItemLexicon.java | 4 ++-- .../vazkii/botania/common/item/ItemSextant.java | 2 +- .../common/world/MysticalFlowerConfig.java | 1 - 9 files changed, 43 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index c75bfd2e8..144c63e8a 100644 --- a/build.gradle +++ b/build.gradle @@ -96,8 +96,8 @@ repositories { } dependencies { - minecraft "net.minecraftforge:forge:${mc_version}-31.0.14" - compile fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.1-25.10") { transitive = false } + minecraft "net.minecraftforge:forge:${mc_version}-31.1.12" + compile fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-28.142") { transitive = false } compileOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2:api") runtimeOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2") diff --git a/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java index d77972f18..9dcc09b55 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java @@ -16,9 +16,9 @@ import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.patchouli.api.IComponentRenderContext; import vazkii.patchouli.api.ICustomComponent; -import vazkii.patchouli.api.VariableHolder; import java.util.Arrays; +import java.util.function.Function; /** * A custom component that renders a mana bar. @@ -29,7 +29,6 @@ public class ManaComponent implements ICustomComponent { private transient int x, y; private transient int[] manaValues; - @VariableHolder public String mana; @Override @@ -60,4 +59,9 @@ public class ManaComponent implements ICustomComponent { String ratioString = I18n.format("botaniamisc.ratio", ratio); font.drawString(ratioString, x + 102 / 2 - font.getStringWidth(ratioString) / 2, y + 15, 0x99000000); } + + @Override + public void onVariablesAvailable(Function lookup) { + mana = lookup.apply(mana); + } } diff --git a/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponent.java index d789c5206..4c883458a 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponent.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponent.java @@ -12,20 +12,26 @@ package vazkii.botania.client.patchouli.component; import net.minecraft.item.crafting.Ingredient; import vazkii.patchouli.api.PatchouliAPI; -import vazkii.patchouli.api.VariableHolder; import java.util.List; +import java.util.function.Function; import java.util.stream.Collectors; /** * Patchouli custom component that draws a rotating circle of items from a provided list. */ public class RotatingItemListComponent extends RotatingItemListComponentBase { - @VariableHolder public List ingredients; @Override protected List makeIngredients() { return ingredients.stream().map(PatchouliAPI.instance::deserializeIngredient).collect(Collectors.toList()); } + + @Override + public void onVariablesAvailable(Function lookup) { + for (int i = 0; i < ingredients.size(); i++) { + ingredients.set(i, lookup.apply(ingredients.get(i))); + } + } } diff --git a/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java index cc80f698f..96011e976 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java @@ -15,20 +15,18 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.IModRecipe; -import vazkii.patchouli.api.VariableHolder; import java.util.List; import java.util.Map; +import java.util.function.Function; /** * Patchouli custom component that draws a rotating circle of items from the defined recipe. */ public class RotatingRecipeComponent extends RotatingItemListComponentBase { - @VariableHolder @SerializedName("recipe_name") public String recipeName; - @VariableHolder @SerializedName("recipe_type") public String recipeType; @@ -45,4 +43,10 @@ public class RotatingRecipeComponent extends RotatingItemListComponentBase { IModRecipe recipe = map.get(new ResourceLocation(recipeName)); return recipe.getInputs(); } + + @Override + public void onVariablesAvailable(Function lookup) { + recipeName = lookup.apply(recipeName); + recipeType = lookup.apply(recipeType); + } } diff --git a/src/main/java/vazkii/botania/client/patchouli/component/TerraPlateComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/TerraPlateComponent.java index 2a09096cf..8188ca3cc 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/TerraPlateComponent.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/TerraPlateComponent.java @@ -16,7 +16,8 @@ import net.minecraft.item.ItemStack; import vazkii.patchouli.api.IComponentRenderContext; import vazkii.patchouli.api.ICustomComponent; import vazkii.patchouli.api.PatchouliAPI; -import vazkii.patchouli.api.VariableHolder; + +import java.util.function.Function; /** * Patchouli custom component that draws provided stacks arranged like the Terrestial Agglomeration Plate multiblock. @@ -24,13 +25,9 @@ import vazkii.patchouli.api.VariableHolder; * Parameters: corner, center, edge, plate can be provided to override default blocks. */ public class TerraPlateComponent implements ICustomComponent { - @VariableHolder public String corner = "botania:livingrock"; - @VariableHolder public String center = "botania:livingrock"; - @VariableHolder public String edge = "minecraft:lapis_block"; - @VariableHolder public String plate = "botania:terra_plate"; private transient int x, y; @@ -74,4 +71,12 @@ public class TerraPlateComponent implements ICustomComponent { RenderSystem.popMatrix(); } + + @Override + public void onVariablesAvailable(Function lookup) { + corner = lookup.apply(corner); + center = lookup.apply(center); + edge = lookup.apply(edge); + plate = lookup.apply(plate); + } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 348e489a8..4df4857f7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -17,6 +17,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockModelRenderer; import net.minecraft.client.renderer.BlockRendererDispatcher; import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.RenderTypeLookup; import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.AtlasTexture; @@ -24,6 +25,8 @@ import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ILightReader; import net.minecraftforge.client.model.data.IModelData; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -61,10 +64,10 @@ public class RenderTileFloatingFlower extends TileEntityRenderer { ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90.0F)); BlockRendererDispatcher brd = Minecraft.getInstance().getBlockRendererDispatcher(); - BlockState state = tile.getWorld().getBlockState(tile.getPos()); - IBakedModel model = brd.getModelForState(state); - // todo 1.15: won't work until MinecraftForge#6442 is merged - brd.renderBlock(state, ms, buffers, light, overlay, data); + BlockState state = tile.getBlockState(); + + IBakedModel ibakedmodel = brd.getModelForState(state); + brd.getBlockModelRenderer().renderModel(ms.peek(), buffers.getBuffer(RenderTypeLookup.getEntityBlockLayer(state)), state, ibakedmodel, 1, 1, 1, light, overlay, data); ms.pop(); diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 5e9f2cd89..3a5671b91 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -91,9 +91,9 @@ public class ItemLexicon extends Item implements IElvenItem { if(playerIn instanceof ServerPlayerEntity) { ServerPlayerEntity player= (ServerPlayerEntity) playerIn; UseItemSuccessTrigger.INSTANCE.trigger(player, stack, player.getServerWorld(), player.getX(), player.getY(), player.getZ()); - NetworkHandler.sendToPlayer(new MessageOpenBookGui(book.resourceLoc.toString()), (ServerPlayerEntity) playerIn); + NetworkHandler.sendToPlayer(new MessageOpenBookGui(book.id), (ServerPlayerEntity) playerIn); SoundEvent sfx = PatchouliSounds.getSound(book.openSound, PatchouliSounds.book_open); - worldIn.playSound(null, playerIn.getX(), playerIn.getY(), playerIn.getZ(), sfx, SoundCategory.PLAYERS, 1F, (float) (0.7 + Math.random() * 0.4)); + playerIn.playSound(sfx, 1F, (float) (0.7 + Math.random() * 0.4)); } return new ActionResult<>(ActionResultType.SUCCESS, stack); diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index 97054b4c4..c59b5bda6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -121,7 +121,7 @@ public class ItemSextant extends Item { if((int) Math.floor(MathHelper.pointDistancePlane(xp, zp, x, z)) == iradius - 1) map.put(new BlockPos(xp - x, 0, zp - z), matcher); } - AbstractMultiblock sparse = (AbstractMultiblock) PatchouliAPI.instance.makeSparseMultiblock(map).setResourceLocation(MULTIBLOCK_ID); + AbstractMultiblock sparse = (AbstractMultiblock) PatchouliAPI.instance.makeSparseMultiblock(map).setId(MULTIBLOCK_ID); Botania.proxy.showMultiblock(sparse, "r = " + (int) radius, new BlockPos(x, y, z), Rotation.NONE); } } diff --git a/src/main/java/vazkii/botania/common/world/MysticalFlowerConfig.java b/src/main/java/vazkii/botania/common/world/MysticalFlowerConfig.java index 1ec24499a..a4c788253 100644 --- a/src/main/java/vazkii/botania/common/world/MysticalFlowerConfig.java +++ b/src/main/java/vazkii/botania/common/world/MysticalFlowerConfig.java @@ -35,7 +35,6 @@ public class MysticalFlowerConfig implements IFeatureConfig { @Nonnull @Override public Dynamic serialize(@Nonnull DynamicOps ops) { - // todo 1.14 return new Dynamic<>(ops); }