From f23fd37821f694f3b4b780e806a2c54536e6c28e Mon Sep 17 00:00:00 2001 From: shedaniel Date: Wed, 22 Jan 2020 01:08:02 +0800 Subject: 1.15.2 mappings --- src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java | 2 +- src/main/java/me/shedaniel/rei/gui/RecipeDisplayExporter.java | 4 ++-- src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java | 4 ++-- .../me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java | 2 +- .../shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java | 4 ++-- .../shedaniel/rei/plugin/information/DefaultInformationCategory.java | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java index fa05ffdc2..876c1d086 100644 --- a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java +++ b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java @@ -168,7 +168,7 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer { ClientSidePacketRegistry.INSTANCE.register(RoughlyEnoughItemsNetwork.NOT_ENOUGH_ITEMS_PACKET, (packetContext, packetByteBuf) -> { Screen currentScreen = MinecraftClient.getInstance().currentScreen; if (currentScreen instanceof CraftingTableScreen) { - RecipeBookWidget recipeBookGui = ((RecipeBookProvider) currentScreen).getRecipeBookGui(); + RecipeBookWidget recipeBookGui = ((RecipeBookProvider) currentScreen).getRecipeBookWidget(); RecipeBookGhostSlots ghostSlots = ((RecipeBookGuiHooks) recipeBookGui).rei_getGhostSlots(); ghostSlots.reset(); diff --git a/src/main/java/me/shedaniel/rei/gui/RecipeDisplayExporter.java b/src/main/java/me/shedaniel/rei/gui/RecipeDisplayExporter.java index 4852f01c8..1f37b39ad 100644 --- a/src/main/java/me/shedaniel/rei/gui/RecipeDisplayExporter.java +++ b/src/main/java/me/shedaniel/rei/gui/RecipeDisplayExporter.java @@ -108,13 +108,13 @@ public final class RecipeDisplayExporter extends Widget { matrixStack.translate(rectangle.x + 8, rectangle.y + 8, 0); matrixStack.scale(16, -16, 1F); - boolean disableGuiLight = !model.hasDepthInGui(); + boolean disableGuiLight = !model.isSideLit(); if (disableGuiLight) { DiffuseLighting.disableGuiDepthLighting(); } VertexConsumerProvider.Immediate immediate = MinecraftClient.getInstance().getBufferBuilders().getEntityVertexConsumers(); - minecraft.getItemRenderer().renderItem(stack, ModelTransformation.Type.GUI, false, matrixStack, immediate, 15728880, OverlayTexture.DEFAULT_UV, model); + minecraft.getItemRenderer().renderItem(stack, ModelTransformation.Mode.GUI, false, matrixStack, immediate, 15728880, OverlayTexture.DEFAULT_UV, model); immediate.draw(); RenderSystem.enableDepthTest(); diff --git a/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java b/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java index 4c5bbd0f9..e03d77745 100644 --- a/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java +++ b/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java @@ -187,10 +187,10 @@ public class ItemEntryStack extends AbstractEntryStack implements OptimalEntrySt MATRICES.scale(bounds.getWidth(), (bounds.getWidth() + bounds.getHeight()) / -2f, bounds.getHeight()); VertexConsumerProvider.Immediate immediate = MinecraftClient.getInstance().getBufferBuilders().getEntityVertexConsumers(); BakedModel model = getModelFromStack(stack); - boolean bl = !model.hasDepthInGui(); + boolean bl = !model.isSideLit(); if (bl) GlStateManager.method_24221(); - MinecraftClient.getInstance().getItemRenderer().renderItem(stack, ModelTransformation.Type.GUI, false, MATRICES, immediate, 15728880, OverlayTexture.DEFAULT_UV, model); + MinecraftClient.getInstance().getItemRenderer().renderItem(stack, ModelTransformation.Mode.GUI, false, MATRICES, immediate, 15728880, OverlayTexture.DEFAULT_UV, model); immediate.draw(); if (bl) GlStateManager.method_24222(); diff --git a/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java b/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java index db689be59..7f3307b24 100644 --- a/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java +++ b/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java @@ -57,7 +57,7 @@ public class DefaultCategoryHandler implements AutoTransferHandler { context.getMinecraft().openScreen(containerScreen); if (containerScreen instanceof RecipeBookProvider) - ((RecipeBookGuiHooks) ((RecipeBookProvider) containerScreen).getRecipeBookGui()).rei_getGhostSlots().reset(); + ((RecipeBookGuiHooks) ((RecipeBookProvider) containerScreen).getRecipeBookWidget()).rei_getGhostSlots().reset(); PacketByteBuf buf = new PacketByteBuf(Unpooled.buffer()); buf.writeIdentifier(recipe.getRecipeCategory()); buf.writeBoolean(Screen.hasShiftDown()); diff --git a/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java b/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java index 16eb8c6c3..63ec070b8 100644 --- a/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java +++ b/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java @@ -51,7 +51,7 @@ public class DefaultRecipeBookHandler implements AutoTransferHandler { return Result.createSuccessful(); context.getMinecraft().openScreen(context.getContainerScreen()); if (context.getContainerScreen() instanceof RecipeBookProvider) - ((RecipeBookGuiHooks) ((RecipeBookProvider) context.getContainerScreen()).getRecipeBookGui()).rei_getGhostSlots().reset(); + ((RecipeBookGuiHooks) ((RecipeBookProvider) context.getContainerScreen()).getRecipeBookWidget()).rei_getGhostSlots().reset(); context.getMinecraft().interactionManager.clickRecipe(container.syncId, recipe, Screen.hasShiftDown()); ScreenHelper.getLastOverlay().init(); } @@ -65,7 +65,7 @@ public class DefaultRecipeBookHandler implements AutoTransferHandler { return Result.createSuccessful(); context.getMinecraft().openScreen(context.getContainerScreen()); if (context.getContainerScreen() instanceof RecipeBookProvider) - ((RecipeBookGuiHooks) ((RecipeBookProvider) context.getContainerScreen()).getRecipeBookGui()).rei_getGhostSlots().reset(); + ((RecipeBookGuiHooks) ((RecipeBookProvider) context.getContainerScreen()).getRecipeBookWidget()).rei_getGhostSlots().reset(); context.getMinecraft().interactionManager.clickRecipe(container.syncId, recipe, Screen.hasShiftDown()); ScreenHelper.getLastOverlay().init(); } diff --git a/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java b/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java index d0cb18068..2774f6670 100644 --- a/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java @@ -89,7 +89,7 @@ public class DefaultInformationCategory implements RecipeCategory