Merge pull request #174 from FlintMC/mapping-hotfix

mapping hotfix
FlintMC · Apr 23, 2021 · 3cd4fe8 · 3cd4fe8
2 parents e4e803a + fb18864
commit 3cd4fe8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 47 deletions.
diff --git a/...6_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/FlatGenerationSettingsShadow.java b/...6_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/FlatGenerationSettingsShadow.java
@@ -27,7 +27,7 @@
 @Shadow("net.minecraft.world.gen.FlatGenerationSettings")
 public interface FlatGenerationSettingsShadow {
 
-  @FieldGetter("field_242867_d")
+  @FieldGetter("biomeRegistry")
   Registry<Biome> getBiomeRegistry();
 
 }
diff --git a/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/stats/StatsScreenShadow.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/stats/StatsScreenShadow.java
@@ -58,7 +58,7 @@ interface GeneralListShadow {
 
     @SuppressWarnings("unchecked")
     default List<GeneralStat> getStats() {
-      return (List<GeneralStat>) ((AbstractListShadow) this).getChildren();
+      return (List<GeneralStat>) ((AbstractListShadow) this).getEntries();
     }
 
     @Shadow("net.minecraft.client.gui.screen.StatsScreen$CustomStatsList$Entry")
@@ -74,7 +74,7 @@ interface MobListShadow {
 
     @SuppressWarnings("unchecked")
     default List<MobStat> getStats() {
-      return (List<MobStat>) ((AbstractListShadow) this).getChildren();
+      return (List<MobStat>) ((AbstractListShadow) this).getEntries();
     }
 
     @Shadow("net.minecraft.client.gui.screen.StatsScreen$MobStatsList$Entry")
@@ -101,9 +101,7 @@ interface ItemListShadow {
   @Shadow("net.minecraft.client.gui.widget.list.AbstractList")
   interface AbstractListShadow {
 
-    @FieldGetter("children")
-    List<?> getChildren();
-
+    @FieldGetter("entries")
+    List<?> getEntries();
   }
-
 }
diff --git a/minecraft/minecraft-1-15-2/build.gradle.kts b/minecraft/minecraft-1-15-2/build.gradle.kts
@@ -31,26 +31,6 @@ flint {
             from("build/generated/flint/version.json")
             to("versions/flint-1.15.2/flint-1.15.2.json")
         }
-
-        create("joined.tsrg") {
-            from("jar:https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_config/1.15.2-20200515.085601/mcp_config-1.15.2-20200515.085601.zip!/config/joined.tsrg")
-            to("flint/assets/1.15.2/joined.tsrg")
-        }
-
-        create("fields.csv") {
-            from("jar:https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_snapshot/20200610-1.15.1/mcp_snapshot-20200610-1.15.1.zip!/fields.csv")
-            to("flint/assets/1.15.2/fields.csv")
-        }
-
-        create("params.csv") {
-            from("jar:https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_snapshot/20200610-1.15.1/mcp_snapshot-20200610-1.15.1.zip!/params.csv")
-            to("flint/assets/1.15.2/params.csv")
-        }
-
-        create("methods.csv") {
-            from("jar:https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_snapshot/20200610-1.15.1/mcp_snapshot-20200610-1.15.1.zip!/methods.csv")
-            to("flint/assets/1.15.2/methods.csv")
-        }
     }
 }
 

diff --git a/minecraft/minecraft-1-16-5/build.gradle.kts b/minecraft/minecraft-1-16-5/build.gradle.kts
@@ -31,26 +31,6 @@ flint {
             from("build/generated/flint/version.json")
             to("versions/flint-1.16.5/flint-1.16.5.json")
         }
-
-        create("joined.tsrg") {
-            from("jar:https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_config/1.16.5/mcp_config-1.16.5.zip!/config/joined.tsrg")
-            to("flint/assets/1.16.5/joined.tsrg")
-        }
-
-        create("fields.csv") {
-            from("jar:https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_snapshot/20201028-1.16.3/mcp_snapshot-20201028-1.16.3.zip!/fields.csv")
-            to("flint/assets/1.16.5/fields.csv")
-        }
-
-        create("params.csv") {
-            from("jar:https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_snapshot/20201028-1.16.3/mcp_snapshot-20201028-1.16.3.zip!/params.csv")
-            to("flint/assets/1.16.5/params.csv")
-        }
-
-        create("methods.csv") {
-            from("jar:https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_snapshot/20201028-1.16.3/mcp_snapshot-20201028-1.16.3.zip!/methods.csv")
-            to("flint/assets/1.16.5/methods.csv")
-        }
     }
 }