1.21.4?HEADdev

2 files changed, 12 insertions, 12 deletions

diff --git a/src/main/java/org/chrisoft/trashyaddon/commands/CEntitySelectorOptions.java b/src/main/java/org/chrisoft/trashyaddon/commands/CEntitySelectorOptions.java
index c49e80f..cd28653 100644
--- a/src/main/java/org/chrisoft/trashyaddon/commands/CEntitySelectorOptions.java
+++ b/src/main/java/org/chrisoft/trashyaddon/commands/CEntitySelectorOptions.java
@@ -18,14 +18,15 @@ import net.minecraft.advancement.AdvancementProgress;
 import net.minecraft.advancement.PlayerAdvancementTracker;
 import net.minecraft.advancement.criterion.CriterionProgress;
 import net.minecraft.command.CommandSource;
+import net.minecraft.command.FloatRangeArgument;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.loot.condition.LootCondition;
 import net.minecraft.loot.context.LootContext;
-import net.minecraft.loot.context.LootContextParameterSet;
 import net.minecraft.loot.context.LootContextParameters;
 import net.minecraft.loot.context.LootContextTypes;
+import net.minecraft.loot.context.LootWorldContext;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtHelper;
 import net.minecraft.nbt.StringNbtReader;
@@ -46,7 +47,6 @@ import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.GameMode;
-import net.minecraft.command.FloatRangeArgument;
 
 public class CEntitySelectorOptions {
     private static final Map<String, CEntitySelectorOptions.SelectorOption> OPTIONS = Maps.newHashMap();
@@ -269,10 +269,10 @@ public class CEntitySelectorOptions {
             putOption("type", reader -> {
                 reader.setSuggestionProvider((builder, consumer) -> {
                     CommandSource.suggestIdentifiers(Registries.ENTITY_TYPE.getIds(), builder, String.valueOf('!'));
-                    CommandSource.suggestIdentifiers(Registries.ENTITY_TYPE.streamTags().map(TagKey::id), builder, "!#");
+                    CommandSource.suggestIdentifiers(Registries.ENTITY_TYPE.streamTags().map(tag -> tag.getTag().id()), builder, "!#");
                     if (!reader.excludesEntityType()) {
                         CommandSource.suggestIdentifiers(Registries.ENTITY_TYPE.getIds(), builder);
-                        CommandSource.suggestIdentifiers(Registries.ENTITY_TYPE.streamTags().map(TagKey::id), builder, String.valueOf('#'));
+                        CommandSource.suggestIdentifiers(Registries.ENTITY_TYPE.streamTags().map(tag -> tag.getTag().id()), builder, String.valueOf('#'));
                     }
 
                     return builder.buildFuture();
@@ -292,7 +292,7 @@ public class CEntitySelectorOptions {
                         reader.addPredicate(entity -> entity.getType().isIn(lv) != bl);
                     } else {
                         Identifier lv2 = Identifier.fromCommandInput(reader.getReader());
-                        EntityType<?> lv3 = Registries.ENTITY_TYPE.getOrEmpty(lv2).orElseThrow(() -> {
+                        EntityType<?> lv3 = Registries.ENTITY_TYPE.getOptionalValue(lv2).orElseThrow(() -> {
                             reader.getReader().setCursor(i);
                             return INVALID_TYPE_EXCEPTION.createWithContext(reader.getReader(), lv2.toString());
                         });
@@ -320,7 +320,7 @@ public class CEntitySelectorOptions {
                     if (entity instanceof ServerPlayerEntity lv2) {
                         ItemStack lv3 = lv2.getInventory().getMainHandStack();
                         if (!lv3.isEmpty()) {
-                            lvx.put("SelectedItem", lv3.encode(lv2.getRegistryManager()));
+                            lvx.put("SelectedItem", lv3.toNbt(lv2.getRegistryManager()));
                         }
                     }
 
@@ -468,12 +468,12 @@ public class CEntitySelectorOptions {
                                 Optional<LootCondition> optional = lvx.getServer()
                                     .getReloadableRegistries()
                                     .createRegistryLookup()
-                                    .getOptionalEntry(RegistryKeys.PREDICATE, lv)
+                                    .getOptionalEntry(lv)
                                     .map(RegistryEntry::value);
                                 if (optional.isEmpty()) {
                                     return false;
                                 } else {
-                                    LootContextParameterSet lv2 = new LootContextParameterSet.Builder(lvx)
+                                    LootWorldContext lv2 = new LootWorldContext.Builder(lvx)
                                         .add(LootContextParameters.THIS_ENTITY, entity)
                                         .add(LootContextParameters.ORIGIN, entity.getPos())
                                         .build(LootContextTypes.SELECTOR);
diff --git a/src/main/java/org/chrisoft/trashyaddon/mixin/WorldRendererMixin.java b/src/main/java/org/chrisoft/trashyaddon/mixin/WorldRendererMixin.java
index f953e7e..16c5556 100644
--- a/src/main/java/org/chrisoft/trashyaddon/mixin/WorldRendererMixin.java
+++ b/src/main/java/org/chrisoft/trashyaddon/mixin/WorldRendererMixin.java
@@ -20,7 +20,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(value = WorldRenderer.class, priority = 999)
 public abstract class WorldRendererMixin {
     @Shadow
-    private Framebuffer entityOutlinesFramebuffer;
+    private Framebuffer entityOutlineFramebuffer;
     @Shadow
     protected abstract void renderEntity(Entity entity, double cameraX, double cameraY, double cameraZ, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers);
 
@@ -34,15 +34,15 @@ public abstract class WorldRendererMixin {
     @Unique
     private void drawShaded(Entity entity, double cameraX, double cameraY, double cameraZ, float tickDelta, VertexConsumerProvider vertexConsumers, MatrixStack matrices, EntityShader shader, Color color) {
         if (shader.shouldDraw(entity) && !PostProcessShaders.isCustom(vertexConsumers) && color != null) {
-            Framebuffer prevBuffer = this.entityOutlinesFramebuffer;
-            this.entityOutlinesFramebuffer = shader.framebuffer;
+            Framebuffer prevBuffer = this.entityOutlineFramebuffer;
+            this.entityOutlineFramebuffer = shader.framebuffer;
             PostProcessShaders.rendering = true;
 
             shader.vertexConsumerProvider.setColor(color.r, color.g, color.b, color.a);
             renderEntity(entity, cameraX, cameraY, cameraZ, tickDelta, matrices, shader.vertexConsumerProvider);
 
             PostProcessShaders.rendering = false;
-            this.entityOutlinesFramebuffer = prevBuffer;
+            this.entityOutlineFramebuffer = prevBuffer;
         }
     }
 }