mappings

src/main/java/carpet/helpers/EntityPlayerActionPack.java

@@ -2,7 +2,7 @@ package carpet.helpers;
 
 import carpet.fakes.ServerPlayerEntityInterface;
 import net.minecraft.block.BlockState;
-import net.minecraft.command.arguments.EntityAnchorArgumentType;
+import net.minecraft.command.argument.EntityAnchorArgumentType;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.passive.HorseBaseEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -167,12 +167,12 @@ public class EntityPlayerActionPack
         List<Entity> entities;
         if (onlyRideables)
         {
-            entities = player.world.getEntities(player, player.getBoundingBox().expand(3.0D, 1.0D, 3.0D),
+            entities = player.world.getOtherEntities(player, player.getBoundingBox().expand(3.0D, 1.0D, 3.0D),
                     e -> e instanceof MinecartEntity || e instanceof BoatEntity || e instanceof HorseBaseEntity);
         }
             else
         {
-            entities = player.world.getEntities(player, player.getBoundingBox().expand(3.0D, 1.0D, 3.0D));
+            entities = player.world.getOtherEntities(player, player.getBoundingBox().expand(3.0D, 1.0D, 3.0D));
         }
         if (entities.size()==0)
             return this;

src/main/java/carpet/helpers/FeatureGenerator.java

@@ -22,7 +22,7 @@ import net.minecraft.world.biome.source.BiomeAccess;
 import net.minecraft.world.gen.ChunkRandom;
 import net.minecraft.world.gen.chunk.ChunkGenerator;
 import net.minecraft.world.gen.chunk.StructureConfig;
-import net.minecraft.world.gen.decorator.BeehiveTreeDecorator;
+import net.minecraft.world.gen.tree.BeehiveTreeDecorator;
 import net.minecraft.world.gen.feature.ConfiguredFeature;
 import net.minecraft.world.gen.feature.ConfiguredFeatures;
 import net.minecraft.world.gen.feature.ConfiguredStructureFeature;
@@ -175,9 +175,9 @@ public class FeatureGenerator
     }
 
     private static final Map<String, Thing> featureMap = new HashMap<String, Thing>() {{
-        put("oak_bees", simpleTree(ConfiguredFeatures.OAK.method_30381().setTreeDecorators(ImmutableList.of(new BeehiveTreeDecorator(1.0F)))));
-        put("fancy_oak_bees", simpleTree(ConfiguredFeatures.FANCY_OAK.method_30381().setTreeDecorators(ImmutableList.of(new BeehiveTreeDecorator(1.0F)))));
-        put("birch_bees", simpleTree(ConfiguredFeatures.BIRCH.method_30381().setTreeDecorators(ImmutableList.of(new BeehiveTreeDecorator(1.0F)))));
+        put("oak_bees", simpleTree(ConfiguredFeatures.OAK.getConfig().setTreeDecorators(ImmutableList.of(new BeehiveTreeDecorator(1.0F)))));
+        put("fancy_oak_bees", simpleTree(ConfiguredFeatures.FANCY_OAK.getConfig().setTreeDecorators(ImmutableList.of(new BeehiveTreeDecorator(1.0F)))));
+        put("birch_bees", simpleTree(ConfiguredFeatures.BIRCH.getConfig().setTreeDecorators(ImmutableList.of(new BeehiveTreeDecorator(1.0F)))));
         put("coral_tree", simplePlop(Feature.CORAL_TREE.configure(FeatureConfig.DEFAULT)));
         put("coral_claw", simplePlop(Feature.CORAL_CLAW.configure(FeatureConfig.DEFAULT)));
         put("coral_mushroom", simplePlop(Feature.CORAL_MUSHROOM.configure(FeatureConfig.DEFAULT)));

src/main/java/carpet/helpers/OptimizedExplosion.java

@@ -102,8 +102,7 @@ public class OptimizedExplosion
         if (vec3dmem == null || !vec3dmem.equals(vec3d) || tickmem != eAccess.getWorld().getTime()) {
             vec3dmem = vec3d;
             tickmem = eAccess.getWorld().getTime();
-            entitylist = eAccess.getWorld().getEntities((Entity)null,
-                    new Box((double) k1, (double) i2, (double) j2, (double) l1, (double) i1, (double) j1));
+            entitylist = eAccess.getWorld().getOtherEntities(null, new Box(k1, i2, j2, l1, i1, j1));
             explosionSound = 0;
         }
 

src/main/java/carpet/helpers/ParticleDisplay.java

@@ -2,7 +2,7 @@ package carpet.helpers;
 
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.minecraft.command.arguments.ParticleArgumentType;
+import net.minecraft.command.argument.ParticleArgumentType;
 import net.minecraft.particle.ParticleEffect;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;

src/main/java/carpet/helpers/Tracer.java

@@ -48,7 +48,7 @@ public class Tracer
         double targetDistance = maxSqDistance;
         Entity target = null;
         Vec3d targetHitPos = null;
-        for (Entity current : world.getEntities(source, box, predicate))
+        for (Entity current : world.getOtherEntities(source, box, predicate))
         {
             Box currentBox = current.getBoundingBox().expand(current.getTargetingMargin());
             Optional<Vec3d> currentHit = currentBox.rayTrace(start, end);