1.21.11

Author: Traben-0

CHANGELOG.MD

@@ -1,4 +1,7 @@
 
+[7.0.7]
+- updated to 1.21.11
+
 [7.0.6]
 - fixed crash when clicking "Add ETF features to skin" in the skin tool
 - fixed forge and neoforge crash, affecting EMF also, relating to checking loaded mods

build.gradle.kts

@@ -42,6 +42,7 @@ base.archivesName.set("entity_texture_features-$modVersion-${project.name}")
 
 // todo figure out why preprocessor wont work with these
 val accessWidener = "entity_texture_features_" + when {
+    mcVersion >= 12111 -> 13
     mcVersion >= 12109 -> 12
     mcVersion >= 12106 -> 11
     mcVersion >= 12105 -> 10

gradle.properties

@@ -8,7 +8,7 @@ essential.defaults.loom.mappings=mojmap
 
 loom.ignoreDependencyLoomVersionValidation=true
 
-mod_version=7.0.6
+mod_version=7.0.7
 maven_group=traben.entity_texture_features
 archives_base_name=entity_texture_features
 

root.gradle.kts

@@ -50,6 +50,8 @@ preprocess {
 
     val current = null.connectToVersion(12109)
 
+    current.connectToVersion(12111, neoforge = false)
+
     // next, then remap the main project to this and set the current to old
     //current.connectToVersion(12109, forge = false, neoforge = false)
 

settings.gradle.kts

@@ -37,6 +37,7 @@ fun MutableList<String>.version(mcVersion: Int, forge: Boolean = true, neoforge:
 }
 
 mutableListOf<String>()
+    .version(12111, neoforge = false)
     .version(12109)
     .version(12106)
     .version(12105)

src/main/java/traben/entity_texture_features/config/screens/ETFConfigScreenMain.java

@@ -296,7 +296,13 @@ public void renderSimple(final PoseStack matrix, final MultiBufferSource vcp, Re
             matrix.pushPose();
             matrix.scale(-1.0F, -1.0F, 1.0F);
             matrix.translate(0.0F, -1.501F, 0.0F);
-            RenderType rendertype = RenderType.entitySolid(texture);
+            RenderType rendertype =
+                    //#if MC>= 12111
+                    //$$ net.minecraft.client.renderer.rendertype.RenderTypes
+                    //#else
+                    RenderType
+                    //#endif
+                            .entitySolid(texture);
             //noinspection ConstantValue
             if (rendertype != null) {
                 VertexConsumer vertexconsumer = vcp.getBuffer(rendertype);

src/main/java/traben/entity_texture_features/config/screens/skin/ETFConfigScreenSkinTool.java

@@ -564,7 +564,11 @@ public static void renderEntityInInventoryFollowsMouse(boolean flipView, GuiGrap
         float w = livingEntity.getScale();
         Vector3f vector3f = new Vector3f(0.0F, livingEntity.getBbHeight() / 2.0F + f * w, 0.0F);
         float x = (float)m / w;
-        InventoryScreen.renderEntityInInventory(guiGraphics, i, j, k, l, x, vector3f, quaternionf, quaternionf2, livingEntity);
+        InventoryScreen.renderEntityInInventory(
+                //#if MC < 12111
+                guiGraphics, i, j, k, l, x, vector3f, quaternionf, quaternionf2,
+                //#endif
+                livingEntity);
         livingEntity.yBodyRot = r;
         livingEntity.setYRot(s);
         livingEntity.setXRot(t);

src/main/java/traben/entity_texture_features/config/screens/skin/ETFConfigScreenSkinToolPixelSelection.java

@@ -88,7 +88,13 @@ protected void init() {
     @NotNull
     private Button getButtonPixels(final int x, final int y, final int pixelSize) {
 
-        return new Button((int) ((ETFConfigScreenSkinToolPixelSelection.this.width * 0.35) + (x * pixelSize)), (int) ((ETFConfigScreenSkinToolPixelSelection.this.height * 0.2) + (y * pixelSize)), pixelSize, pixelSize,
+        return new
+                //#if MC >= 12111
+                //$$ Button.Plain
+                //#else
+                Button
+                //#endif
+                ((int) ((ETFConfigScreenSkinToolPixelSelection.this.width * 0.35) + (x * pixelSize)), (int) ((ETFConfigScreenSkinToolPixelSelection.this.height * 0.2) + (y * pixelSize)), pixelSize, pixelSize,
                 Component.nullToEmpty(""),
                 (button) -> {
                     int colorAtPixel = ETFUtils2.getPixel(etfParent.currentEditorSkin, x, y);
@@ -106,11 +112,17 @@ private Button getButtonPixels(final int x, final int y, final int pixelSize) {
                     }
                 }, Supplier::get) {
 
+            //#if MC >= 12111
+            //$$    @Override
+            //$$        protected void renderContents(GuiGraphics guiGraphics, int i, int j, float f) {
+            //$$    }
+            //#else
             @Override
             protected void renderWidget(GuiGraphics context, int mouseX, int mouseY, float delta) {
                 //invisible lol
 //                        super.renderWidget(context, mouseX, mouseY, delta);
             }
+            //#endif
 
         };
     }

src/main/java/traben/entity_texture_features/config/screens/skin/ETFScreenOldCompat.java

@@ -10,7 +10,6 @@
 //#if MC>=12106
 import net.minecraft.client.renderer.RenderPipelines;
 //#endif
-import net.minecraft.client.renderer.RenderStateShard;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
@@ -53,8 +52,8 @@ public static void renderGUITexture(GuiGraphics context, ResourceLocation textur
         //#elseif MC >= 12103
         //$$ context.blit(RenderType::guiTextured, texture, (int) x1, (int) y1, 0, 0, (int) (x2-x1), (int) (y2-y1), 1, 1, 1, 1,
         //$$         net.minecraft.util.ARGB.color( 255, 255, 255, 255));
-        //#else //mc_21
-//$$
+        //#else
+        //$$
         //$$ RenderSystem.setShaderTexture(0, texture);
         //$$ RenderSystem.setShader(  GameRenderer::getPositionTexColorShader );
         //$$ RenderSystem.enableBlend();

src/main/java/traben/entity_texture_features/features/ETFRenderContext.java

@@ -173,15 +173,39 @@ && isAllowedToRenderLayerTextureModify()) {
                     preventRenderLayerTextureModify();
 
                     RenderType forReturn = switch (layer) {
-                        case TRANSLUCENT -> RenderType.entityTranslucent(texture.get());
+                        case TRANSLUCENT ->
+                            //#if MC>= 12111
+                            //$$ net.minecraft.client.renderer.rendertype.RenderTypes
+                            //#else
+                            RenderType
+                            //#endif
+                                    .entityTranslucent(texture.get());
                         case TRANSLUCENT_CULL ->
                         //#if MC >= 12103
-                             RenderType.entityTranslucent(texture.get());
+
+                            //#if MC>= 12111
+                            //$$ net.minecraft.client.renderer.rendertype.RenderTypes
+                            //#else
+                            RenderType
+                            //#endif
+                                    .entityTranslucent(texture.get());
                         //#else
                         //$$     RenderType.entityTranslucentCull(texture.get());
                         //#endif
-                        case END -> RenderType.endGateway();
-                        case OUTLINE -> RenderType.outline(texture.get());
+                        case END ->
+                            //#if MC>= 12111
+                            //$$ net.minecraft.client.renderer.rendertype.RenderTypes
+                            //#else
+                            RenderType
+                            //#endif
+                                    .endGateway();
+                        case OUTLINE ->
+                            //#if MC>= 12111
+                            //$$ net.minecraft.client.renderer.rendertype.RenderTypes
+                            //#else
+                            RenderType
+                            //#endif
+                                    .outline(texture.get());
                     };
                     allowRenderLayerTextureModify();
                     return forReturn;