From 8870c245ff9f84cf6ece65701d306640f2a5acfc Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Tue, 20 Apr 2021 00:09:00 -0300
Subject: [PATCH] mapping

---
 gradle.properties                                           | 4 ++--
 ...xin.java => TrapezoidHeightProvider_cleanLogsMixin.java} | 6 +++---
 ...=> VeryBiasedToBottomHeightProvider_cleanLogsMixin.java} | 6 +++---
 src/main/resources/carpet.mixins.json                       | 4 +++-
 4 files changed, 11 insertions(+), 9 deletions(-)
 rename src/main/java/carpet/mixins/{BaseRangeDecorator2_cleanLogsMixin.java => TrapezoidHeightProvider_cleanLogsMixin.java} (78%)
 rename src/main/java/carpet/mixins/{BaseRangeDecorator_cleanLogsMixin.java => VeryBiasedToBottomHeightProvider_cleanLogsMixin.java} (75%)

diff --git a/gradle.properties b/gradle.properties
index 9660afe0..dcb56dc8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,9 +5,9 @@ org.gradle.jvmargs=-Xmx1G
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
 	minecraft_version=21w15a
-	yarn_mappings=21w15a+build.1
+	yarn_mappings=21w15a+build.16
 	loader_version=0.11.3
-	fabric_version=0.32.7+1.17
+	fabric_version=0.33.0+1.17
 
 # Mod Properties
 	mod_version = 1.4.32
diff --git a/src/main/java/carpet/mixins/BaseRangeDecorator2_cleanLogsMixin.java b/src/main/java/carpet/mixins/TrapezoidHeightProvider_cleanLogsMixin.java
similarity index 78%
rename from src/main/java/carpet/mixins/BaseRangeDecorator2_cleanLogsMixin.java
rename to src/main/java/carpet/mixins/TrapezoidHeightProvider_cleanLogsMixin.java
index 1295c0b4..34030c74 100644
--- a/src/main/java/carpet/mixins/BaseRangeDecorator2_cleanLogsMixin.java
+++ b/src/main/java/carpet/mixins/TrapezoidHeightProvider_cleanLogsMixin.java
@@ -1,14 +1,14 @@
 package carpet.mixins;
 
 import carpet.CarpetSettings;
-import net.minecraft.class_6342;
+import net.minecraft.world.gen.heightprovider.TrapezoidHeightProvider;
 import org.apache.logging.log4j.Logger;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-@Mixin(class_6342.class)
-public class BaseRangeDecorator2_cleanLogsMixin {
+@Mixin(TrapezoidHeightProvider.class)
+public class TrapezoidHeightProvider_cleanLogsMixin {
 
     //@SuppressWarnings("UnresolvedMixinReference")
     @Redirect(method = "get",
diff --git a/src/main/java/carpet/mixins/BaseRangeDecorator_cleanLogsMixin.java b/src/main/java/carpet/mixins/VeryBiasedToBottomHeightProvider_cleanLogsMixin.java
similarity index 75%
rename from src/main/java/carpet/mixins/BaseRangeDecorator_cleanLogsMixin.java
rename to src/main/java/carpet/mixins/VeryBiasedToBottomHeightProvider_cleanLogsMixin.java
index d52f77ad..d64569eb 100644
--- a/src/main/java/carpet/mixins/BaseRangeDecorator_cleanLogsMixin.java
+++ b/src/main/java/carpet/mixins/VeryBiasedToBottomHeightProvider_cleanLogsMixin.java
@@ -1,14 +1,14 @@
 package carpet.mixins;
 
 import carpet.CarpetSettings;
-import net.minecraft.class_6343;
+import net.minecraft.world.gen.heightprovider.VeryBiasedToBottomHeightProvider;
 import org.apache.logging.log4j.Logger;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-@Mixin(class_6343.class)
-public class BaseRangeDecorator_cleanLogsMixin {
+@Mixin(VeryBiasedToBottomHeightProvider.class)
+public class VeryBiasedToBottomHeightProvider_cleanLogsMixin {
 
     //@SuppressWarnings("UnresolvedMixinReference")
     @Redirect(method = "get",
diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json
index 026c8537..3ecc0180 100644
--- a/src/main/resources/carpet.mixins.json
+++ b/src/main/resources/carpet.mixins.json
@@ -202,7 +202,9 @@
     "BlockItem_creativeNoClipMixin",
     "WallStandingBlockItem_creativeNoClipMixin",
     "LivingEntity_creativeFlyMixin",
-    "BaseRangeDecorator_cleanLogsMixin", "BaseRangeDecorator2_cleanLogsMixin"
+
+    "VeryBiasedToBottomHeightProvider_cleanLogsMixin",
+    "TrapezoidHeightProvider_cleanLogsMixin"
   ],
   "client": [
     "RenderTickCounter_tickSpeedMixin",