From 8341de88a57ffe7c6be6634314ce7f18bccaf28e Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 10 Apr 2021 02:29:48 +0800 Subject: Primitive port to 21w14a Signed-off-by: shedaniel --- default-plugin/build.gradle | 2 +- .../java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java | 4 ++-- .../rei/plugin/client/categories/DefaultBrewingCategory.java | 4 ++-- .../rei/plugin/client/categories/DefaultInformationCategory.java | 7 ++++--- .../rei/plugin/client/favorites/GameModeFavoriteEntry.java | 4 ++-- .../rei/plugin/client/favorites/WeatherFavoriteEntry.java | 3 ++- 6 files changed, 13 insertions(+), 11 deletions(-) (limited to 'default-plugin') diff --git a/default-plugin/build.gradle b/default-plugin/build.gradle index 88bf7f1f4..6dcf4d550 100644 --- a/default-plugin/build.gradle +++ b/default-plugin/build.gradle @@ -10,7 +10,7 @@ dependencies { } architectury { - common() + common(forgeEnabled.toBoolean()) } remapJar { diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java index 9e609e3ce..8cfcac481 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java @@ -189,7 +189,7 @@ public class DefaultClientPlugin implements REIClientPlugin, BuiltinClientPlugin registry.addWorkstations(PATHING, EntryStacks.of(item)); } }); - TagCollection itemTagCollection = Minecraft.getInstance().getConnection().getTags().getItems(); + TagCollection itemTagCollection = Minecraft.getInstance().getConnection().getTags().getOrEmpty(Registry.ITEM_REGISTRY); Tag axesTag = itemTagCollection.getTag(new ResourceLocation("c", "axes")); if (axesTag != null) { for (Item item : axesTag.getValues()) { @@ -366,7 +366,7 @@ public class DefaultClientPlugin implements REIClientPlugin, BuiltinClientPlugin } public static Map getStrippedBlocksMap() { - return STRIPABLES; + return STRIPPABLES; } } diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultBrewingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultBrewingCategory.java index 42434df3a..61ef86b37 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultBrewingCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultBrewingCategory.java @@ -24,6 +24,7 @@ package me.shedaniel.rei.plugin.client.categories; import com.google.common.collect.Lists; +import com.mojang.blaze3d.systems.RenderSystem; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.REIHelper; @@ -37,7 +38,6 @@ import me.shedaniel.rei.plugin.common.BuiltinPlugin; import me.shedaniel.rei.plugin.common.displays.brewing.DefaultBrewingDisplay; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.Minecraft; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.util.Mth; @@ -69,7 +69,7 @@ public class DefaultBrewingCategory implements DisplayCategory widgets = Lists.newArrayList(); widgets.add(Widgets.createRecipeBase(bounds)); widgets.add(Widgets.createDrawableWidget((helper, matrices, mouseX, mouseY, delta) -> { - Minecraft.getInstance().getTextureManager().bind(REIHelper.getInstance().getDefaultDisplayTexture()); + RenderSystem.setShaderTexture(0, REIHelper.getInstance().getDefaultDisplayTexture()); helper.blit(matrices, startPoint.x, startPoint.y, 0, 108, 103, 59); int width = Mth.ceil(System.currentTimeMillis() / 250d % 18d); helper.blit(matrices, startPoint.x + 44, startPoint.y + 28, 103, 163, width, 4); diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java index 2d61b4d3c..356cc5da2 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java @@ -47,6 +47,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.events.GuiEventListener; +import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.FormattedText; import net.minecraft.network.chat.TranslatableComponent; @@ -59,14 +60,14 @@ import java.util.Objects; @Environment(EnvType.CLIENT) public class DefaultInformationCategory implements DisplayCategory { protected static void innerBlit(Matrix4f matrix4f, int xStart, int xEnd, int yStart, int yEnd, int z, float uStart, float uEnd, float vStart, float vEnd) { + RenderSystem.setShader(GameRenderer::getPositionTexShader); BufferBuilder bufferBuilder = Tesselator.getInstance().getBuilder(); - bufferBuilder.begin(7, DefaultVertexFormat.POSITION_TEX); + bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX); bufferBuilder.vertex(matrix4f, xStart, yEnd, z).uv(uStart, vEnd).endVertex(); bufferBuilder.vertex(matrix4f, xEnd, yEnd, z).uv(uEnd, vEnd).endVertex(); bufferBuilder.vertex(matrix4f, xEnd, yStart, z).uv(uEnd, vStart).endVertex(); bufferBuilder.vertex(matrix4f, xStart, yStart, z).uv(uStart, vStart).endVertex(); bufferBuilder.end(); - RenderSystem.enableAlphaTest(); BufferUploader.end(bufferBuilder); } @@ -101,7 +102,7 @@ public class DefaultInformationCategory implements DisplayCategory