Update forge mappings to 20200916-1.16.2 (#4749)

gradle.properties

@@ -10,7 +10,7 @@ artifact_basename=appliedenergistics2
 #########################################################
 minecraft_release=1.16
 minecraft_version=1.16.3
-mcp_mappings=20200723-1.16.1
+mcp_mappings=20200916-1.16.2
 forge_version=34.0.8
 
 #########################################################

src/api/java/appeng/api/util/DimensionalCoord.java

@@ -46,19 +46,19 @@ public class DimensionalCoord extends WorldCoord {
     public DimensionalCoord(final TileEntity tileEntity) {
         super(tileEntity);
         this.world = tileEntity.getWorld();
-        this.dimension = this.world.func_230315_m_();
+        this.dimension = this.world.getDimensionType();
     }
 
     public DimensionalCoord(final World world, final int x, final int y, final int z) {
         super(x, y, z);
         this.world = world;
-        this.dimension = world.func_230315_m_();
+        this.dimension = world.getDimensionType();
     }
 
     public DimensionalCoord(final World world, final BlockPos pos) {
         super(pos);
         this.world = world;
-        this.dimension = world.func_230315_m_();
+        this.dimension = world.getDimensionType();
     }
 
     @Override

src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java

@@ -167,7 +167,7 @@ class PaintSplotchesBakedModel implements IDynamicBakedModel {
     }
 
     @Override
-    public boolean func_230044_c_() {
+    public boolean isSideLit() {
         return false;
     }
 

src/main/java/appeng/block/qnb/QnbFormedBakedModel.java

@@ -203,7 +203,7 @@ class QnbFormedBakedModel implements IDynamicBakedModel {
     }
 
     @Override
-    public boolean func_230044_c_() {
+    public boolean isSideLit() {
         return false;
     }
 

src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java

@@ -160,7 +160,7 @@ class BlockDefinitionBuilder implements IBlockBuilder {
                 @Override
                 @OnlyIn(Dist.CLIENT)
                 public void setup() {
-                    ItemModelsProperties.func_239418_a_(item, new ResourceLocation("appliedenergistics2:fill_level"),
+                    ItemModelsProperties.registerProperty(item, new ResourceLocation("appliedenergistics2:fill_level"),
                             (is, world, entity) -> {
                                 double curPower = chargeable.getAECurrentPower(is);
                                 double maxPower = chargeable.getAEMaxPower(is);

src/main/java/appeng/client/gui/AEBaseScreen.java

@@ -146,7 +146,7 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
         RenderSystem.popMatrix();
         RenderSystem.enableDepthTest();
 
-        this.func_230459_a_(matrixStack, mouseX, mouseY);
+        this.renderHoveredTooltip(matrixStack, mouseX, mouseY);
 
         for (final Object c : this.buttons) {
             if (c instanceof ITooltip) {

src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java

@@ -211,7 +211,7 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta
                 try {
                     final long id = Long.parseLong(key.substring(1), Character.MAX_RADIX);
                     final CompoundNBT invData = in.getCompound(key);
-                    ITextComponent un = ITextComponent.Serializer.func_240643_a_(invData.getString("un"));
+                    ITextComponent un = ITextComponent.Serializer.getComponentFromJson(invData.getString("un"));
                     final ClientDCInternalInv current = this.getById(id, invData.getLong("sortBy"), un);
 
                     for (int x = 0; x < current.getInventory().getSlots(); x++) {

src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java

@@ -302,7 +302,7 @@ public class MEMonitorableScreen<T extends MEMonitorableContainer> extends AEBas
             // The stack size renderer expects a 16x16 slot, while the button is normally
             // bigger
             int x = this.craftingStatusBtn.x + (this.craftingStatusBtn.getWidth() - 16) / 2;
-            int y = this.craftingStatusBtn.y + (this.craftingStatusBtn.getWidth_CLASH() - 16) / 2;
+            int y = this.craftingStatusBtn.y + (this.craftingStatusBtn.getHeightRealms() - 16) / 2;
             StackSizeRenderer.renderSizeLabel(font, x - this.guiLeft, y - this.guiTop,
                     String.valueOf(container.activeCraftingJobs));
         }

src/main/java/appeng/client/render/DelegateBakedModel.java

@@ -47,8 +47,8 @@ public abstract class DelegateBakedModel implements IBakedModel {
     }
 
     @Override
-    public boolean func_230044_c_() {
-        return baseModel.func_230044_c_();
+    public boolean isSideLit() {
+        return baseModel.isSideLit();
     }
 
     @Override

src/main/java/appeng/client/render/DummyFluidBakedModel.java

@@ -60,7 +60,7 @@ public class DummyFluidBakedModel implements IBakedModel {
     }
 
     @Override
-    public boolean func_230044_c_() {
+    public boolean isSideLit() {
         return false;
     }
 

src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java

@@ -73,8 +73,8 @@ public class DummyFluidDispatcherBakedModel extends DelegateBakedModel {
     }
 
     @Override
-    public boolean func_230044_c_() {
-        return getBaseModel().func_230044_c_();
+    public boolean isSideLit() {
+        return getBaseModel().isSideLit();
     }
 
     @Override
@@ -86,7 +86,7 @@ public class DummyFluidDispatcherBakedModel extends DelegateBakedModel {
     public ItemOverrideList getOverrides() {
         return new ItemOverrideList() {
             @Override
-            public IBakedModel func_239290_a_(IBakedModel originalModel, ItemStack stack, ClientWorld world,
+            public IBakedModel getOverrideModel(IBakedModel originalModel, ItemStack stack, ClientWorld world,
                     LivingEntity entity) {
                 if (!(stack.getItem() instanceof FluidDummyItem)) {
                     return originalModel;

src/main/java/appeng/client/render/FacadeBakedItemModel.java

@@ -80,7 +80,7 @@ public class FacadeBakedItemModel extends DelegateBakedModel {
     }
 
     @Override
-    public boolean func_230044_c_() {
+    public boolean isSideLit() {
         return false;
     }
 

src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java

@@ -50,7 +50,7 @@ public class FacadeDispatcherBakedModel extends DelegateBakedModel {
     public ItemOverrideList getOverrides() {
         return new ItemOverrideList() {
             @Override
-            public IBakedModel func_239290_a_(IBakedModel originalModel, ItemStack stack, ClientWorld world,
+            public IBakedModel getOverrideModel(IBakedModel originalModel, ItemStack stack, ClientWorld world,
                     LivingEntity entity) {
                 if (!(stack.getItem() instanceof FacadeItem)) {
                     return originalModel;

src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java

@@ -331,7 +331,7 @@ public class CableBusBakedModel implements IBakedModel {
     }
 
     @Override
-    public boolean func_230044_c_() {
+    public boolean isSideLit() {
         return false;// TODO
     }
 

src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java

@@ -100,7 +100,7 @@ public class P2PTunnelFrequencyBakedModel implements IDynamicBakedModel {
     }
 
     @Override
-    public boolean func_230044_c_() {
+    public boolean isSideLit() {
         return false;// TODO
     }
 

src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java

@@ -276,7 +276,7 @@ abstract class CraftingCubeBakedModel implements IDynamicBakedModel {
     }
 
     @Override
-    public boolean func_230044_c_() {
+    public boolean isSideLit() {
         return false;
     }
 

src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java

@@ -86,8 +86,8 @@ public class EncodedPatternBakedModel extends DelegateBakedModel {
         // This determines diffuse lighting in the UI, and since we want to render
         // the outputModel in the UI, we need to use it's setting here
         @Override
-        public boolean func_230044_c_() {
-            return outputModel.func_230044_c_();
+        public boolean isSideLit() {
+            return outputModel.isSideLit();
         }
 
     }
@@ -112,7 +112,7 @@ public class EncodedPatternBakedModel extends DelegateBakedModel {
 
         @Nullable
         @Override
-        public IBakedModel func_239290_a_(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world,
+        public IBakedModel getOverrideModel(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world,
                 @Nullable LivingEntity entity) {
             boolean shiftHeld = Screen.hasShiftDown();
             if (shiftHeld) {
@@ -122,12 +122,12 @@ public class EncodedPatternBakedModel extends DelegateBakedModel {
                     IBakedModel realModel = Minecraft.getInstance().getItemRenderer().getItemModelMesher()
                             .getItemModel(output);
                     // Give the item model a chance to handle the overrides as well
-                    realModel = realModel.getOverrides().func_239290_a_(realModel, output, world, entity);
+                    realModel = realModel.getOverrides().getOverrideModel(realModel, output, world, entity);
                     return new ShiftHoldingModelWrapper(getBaseModel(), realModel);
                 }
             }
 
-            return getBaseModel().getOverrides().func_239290_a_(originalModel, stack, world, entity);
+            return getBaseModel().getOverrides().getOverrideModel(originalModel, stack, world, entity);
         }
     }
 

src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java

@@ -107,7 +107,7 @@ public class AutoRotatingBakedModel extends DelegateBakedModel {
             // when piping it
             // to the AO lighter, thus fixing our problem.
             BakedQuad packedQuad = new BakedQuad(unpackedQuad.getVertexData(), quad.getTintIndex(),
-                    unpackedQuad.getFace(), quad.func_187508_a(), quad.func_239287_f_());
+                    unpackedQuad.getFace(), quad.getSprite(), quad.applyDiffuseLighting());
             rotated.add(packedQuad);
         }
         return rotated;

src/main/java/appeng/client/render/model/BiometricCardBakedModel.java

@@ -120,7 +120,7 @@ class BiometricCardBakedModel implements IBakedModel {
     }
 
     @Override
-    public boolean func_230044_c_() {
+    public boolean isSideLit() {
         return false;// TODO
     }
 
@@ -143,7 +143,7 @@ class BiometricCardBakedModel implements IBakedModel {
     public ItemOverrideList getOverrides() {
         return new ItemOverrideList() {
             @Override
-            public IBakedModel func_239290_a_(IBakedModel originalModel, ItemStack stack, ClientWorld world,
+            public IBakedModel getOverrideModel(IBakedModel originalModel, ItemStack stack, ClientWorld world,
                     LivingEntity entity) {
                 String username = "";
                 if (stack.getItem() instanceof IBiometricCard) {

src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java

@@ -50,19 +50,19 @@ class ColorApplicatorBakedModel implements IBakedModel {
         for (BakedQuad quad : quads) {
             int tint;
 
-            if (quad.func_187508_a() == texDark) {
+            if (quad.getSprite() == texDark) {
                 tint = 1;
-            } else if (quad.func_187508_a() == texMedium) {
+            } else if (quad.getSprite() == texMedium) {
                 tint = 2;
-            } else if (quad.func_187508_a() == texBright) {
+            } else if (quad.getSprite() == texBright) {
                 tint = 3;
             } else {
                 result.add(quad);
                 continue;
             }
 
-            BakedQuad newQuad = new BakedQuad(quad.getVertexData(), tint, quad.getFace(), quad.func_187508_a(),
-                    quad.func_239287_f_());
+            BakedQuad newQuad = new BakedQuad(quad.getVertexData(), tint, quad.getFace(), quad.getSprite(),
+                    quad.applyDiffuseLighting());
             result.add(newQuad);
         }
 
@@ -88,7 +88,7 @@ class ColorApplicatorBakedModel implements IBakedModel {
     }
 
     @Override
-    public boolean func_230044_c_() {
+    public boolean isSideLit() {
         return false;// TODO
     }
 

src/main/java/appeng/client/render/model/GlassBakedModel.java

@@ -157,7 +157,7 @@ class GlassBakedModel implements IDynamicBakedModel {
     }
 
     @Override
-    public boolean func_230044_c_() {
+    public boolean isSideLit() {
         // TODO: Forge: Auto-generated method stub
         return false;
     }

src/main/java/appeng/client/render/model/MemoryCardBakedModel.java

@@ -105,7 +105,7 @@ class MemoryCardBakedModel implements IBakedModel {
     }
 
     @Override
-    public boolean func_230044_c_() {
+    public boolean isSideLit() {
         return false;// TODO
     }
 
@@ -128,7 +128,7 @@ class MemoryCardBakedModel implements IBakedModel {
     public ItemOverrideList getOverrides() {
         return new ItemOverrideList() {
             @Override
-            public IBakedModel func_239290_a_(IBakedModel originalModel, ItemStack stack, ClientWorld world,
+            public IBakedModel getOverrideModel(IBakedModel originalModel, ItemStack stack, ClientWorld world,
                     LivingEntity entity) {
                 try {
                     if (stack.getItem() instanceof IMemoryCard) {

src/main/java/appeng/client/render/model/SkyCompassBakedModel.java

@@ -122,7 +122,7 @@ public class SkyCompassBakedModel implements IDynamicBakedModel {
     }
 
     @Override
-    public boolean func_230044_c_() {
+    public boolean isSideLit() {
         return false;
     }
 
@@ -149,7 +149,7 @@ public class SkyCompassBakedModel implements IDynamicBakedModel {
          */
         return new ItemOverrideList() {
             @Override
-            public IBakedModel func_239290_a_(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world,
+            public IBakedModel getOverrideModel(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world,
                     @Nullable LivingEntity entity) {
                 // FIXME: This check prevents compasses being held by OTHERS from getting the
                 // rotation, BUT do we actually still need this???

src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java

@@ -181,7 +181,7 @@ class SpatialPylonBakedModel implements IDynamicBakedModel {
     }
 
     @Override
-    public boolean func_230044_c_() {
+    public boolean isSideLit() {
         return false;
     }
 

src/main/java/appeng/client/render/tesr/ChestTileEntityRenderer.java

@@ -149,7 +149,7 @@ public class ChestTileEntityRenderer extends TileEntityRenderer<ChestTileEntity>
             for (int i = 0; i < quads.size(); i++) {
                 BakedQuad quad = quads.get(i);
                 quads.set(i, new BakedQuad(quad.getVertexData(), quad.getTintIndex(), r.rotate(quad.getFace()),
-                        quad.func_187508_a(), quad.func_239287_f_()));
+                        quad.getSprite(), quad.applyDiffuseLighting()));
             }
 
             return quads;

src/main/java/appeng/container/ContainerLocator.java

@@ -69,7 +69,7 @@ public final class ContainerLocator {
     private final AEPartLocation side;
 
     private ContainerLocator(Type type, int itemIndex, World world, BlockPos blockPos, AEPartLocation side) {
-        this(type, itemIndex, world.func_234923_W_().func_240901_a_(), blockPos, side);
+        this(type, itemIndex, world.getDimensionKey().getLocation(), blockPos, side);
     }
 
     private ContainerLocator(Type type, int itemIndex, ResourceLocation worldId, BlockPos blockPos,

src/main/java/appeng/container/guisync/SyncData.java

@@ -127,7 +127,7 @@ public class SyncData {
                     String json = (String) val;
                     ITextComponent text = null;
                     if (!json.isEmpty()) {
-                        text = ITextComponent.Serializer.func_240643_a_((String) val);
+                        text = ITextComponent.Serializer.getComponentFromJson((String) val);
                     }
                     this.updateTextComponent(text);
                 } else {

src/main/java/appeng/core/AEConfig.java

@@ -595,7 +595,7 @@ public final class AEConfig {
             this.spawnChargedChance = builder.defineInRange("spawnChargedChance", 0.08, 0.0, 1.0);
             this.meteoriteMaximumSpawnHeight = builder.define("meteoriteMaximumSpawnHeight", 180);
             List<String> defaultDimensionWhitelist = new ArrayList<>();
-            defaultDimensionWhitelist.add(World.field_234918_g_.getRegistryName().toString());
+            defaultDimensionWhitelist.add(World.OVERWORLD.getRegistryName().toString());
             this.meteoriteDimensionWhitelist = builder.defineList("meteoriteDimensionWhitelist",
                     defaultDimensionWhitelist, obj -> true);
 

src/main/java/appeng/core/AppEngBootstrap.java

@@ -54,7 +54,7 @@ public final class AppEngBootstrap {
     public synchronized static void enhanceBiomes() {
         // add to all standard biomes
         // TODO: This means we'll not add these things to newly created biomes
-        WorldGenRegistries.field_243657_i.forEach(b -> {
+        WorldGenRegistries.BIOME.forEach(b -> {
             addMeteoriteWorldGen(b);
             addQuartzWorldGen(b, quartzOreFeature, chargedQuartzOreFeature);
         });

src/main/java/appeng/core/Registration.java

@@ -652,7 +652,7 @@ final class Registration {
          * world gen
          */
         for (final IWorldGen.WorldGenType type : IWorldGen.WorldGenType.values()) {
-            registries.worldgen().disableWorldGenForDimension(type, World.field_234919_h_.getRegistryName());
+            registries.worldgen().disableWorldGenForDimension(type, World.THE_NETHER.getRegistryName());
         }
 
         // whitelist from config

src/main/java/appeng/core/api/definitions/ApiItems.java

@@ -221,7 +221,7 @@ public final class ApiItems implements IItems {
                     @OnlyIn(Dist.CLIENT)
                     public void setup() {
                         ColorApplicatorItem colorApplicatorItem = (ColorApplicatorItem) item;
-                        ItemModelsProperties.func_239418_a_(item, new ResourceLocation(AppEng.MOD_ID, "colored"),
+                        ItemModelsProperties.registerProperty(item, new ResourceLocation(AppEng.MOD_ID, "colored"),
                                 (itemStack, world, entity) -> {
                                     // If the stack has no color, don't use the colored model since the impact of
                                     // calling getColor for every quad is extremely high, if the stack tries to

src/main/java/appeng/core/features/registries/WorldGenRegistry.java

@@ -67,7 +67,7 @@ public final class WorldGenRegistry implements IWorldGen {
             throw new IllegalArgumentException("Bad Provider Passed");
         }
 
-        ResourceLocation id = w.func_234923_W_().func_240901_a_();
+        ResourceLocation id = w.getDimensionKey().getLocation();
         final boolean isBadDimension = this.types[type.ordinal()].badDimensions.contains(id);
         final boolean isGoodDimension = this.types[type.ordinal()].enabledDimensions.contains(id);
 

src/main/java/appeng/core/sync/network/NetworkHandler.java

@@ -119,7 +119,7 @@ public class NetworkHandler {
     public void sendToAllAround(final BasePacket message, final TargetPoint point) {
         IPacket<?> pkt = message.toPacket(NetworkDirection.PLAY_TO_CLIENT);
         getServer().getPlayerList().sendToAllNearExcept(point.excluded, point.x, point.y, point.z, point.r2,
-                point.world.func_234923_W_(), pkt);
+                point.world.getDimensionKey(), pkt);
     }
 
     public void sendToServer(final BasePacket message) {

src/main/java/appeng/core/worlddata/WorldData.java

@@ -61,7 +61,7 @@ public final class WorldData implements IWorldData {
         Preconditions.checkNotNull(overworld);
 
         // Attach shared data to the server's overworld dimension
-        if (overworld.func_234923_W_() != ServerWorld.field_234918_g_) {
+        if (overworld.getDimensionKey() != ServerWorld.OVERWORLD) {
             throw new IllegalStateException("The server doesn't have an overworld we could store our data on!");
         }
 
@@ -94,7 +94,7 @@ public final class WorldData implements IWorldData {
                 throw new IllegalStateException("No server set.");
             }
 
-            ServerWorld overworld = server.getWorld(ServerWorld.field_234918_g_);
+            ServerWorld overworld = server.getWorld(ServerWorld.OVERWORLD);
             instance = new WorldData(overworld);
         }
         return instance;

src/main/java/appeng/datagen/providers/loot/BlockDropProvider.java

@@ -65,11 +65,10 @@ public class BlockDropProvider extends BlockLootTables implements IAE2DataProvid
     public void act(@Nonnull DirectoryCache cache) throws IOException {
         for (Map.Entry<RegistryKey<Block>, Block> entry : ForgeRegistries.BLOCKS.getEntries()) {
             LootTable.Builder builder;
-            if (entry.getKey().func_240901_a_().getNamespace().equals(AppEng.MOD_ID)) {
+            if (entry.getKey().getLocation().getNamespace().equals(AppEng.MOD_ID)) {
                 builder = overrides.getOrDefault(entry.getValue(), this::defaultBuilder).apply(entry.getValue());
 
-                IDataProvider.save(GSON, cache, toJson(builder),
-                        getPath(outputFolder, entry.getKey().func_240901_a_()));
+                IDataProvider.save(GSON, cache, toJson(builder), getPath(outputFolder, entry.getKey().getLocation()));
             }
         }
     }

src/main/java/appeng/debug/ChunkLoaderTileEntity.java

@@ -64,7 +64,7 @@ public class ChunkLoaderTileEntity extends AEBaseTileEntity implements ITickable
             ServerWorld serverWorld = (ServerWorld) world;
 
             if (!serverWorld.getForcedChunks().contains(chunkPos.asLong())) {
-                AELog.debug("Force-loading chunk @ %d,%d in %s", chunkPos.x, chunkPos.z, serverWorld.func_234923_W_());
+                AELog.debug("Force-loading chunk @ %d,%d in %s", chunkPos.x, chunkPos.z, serverWorld.getDimensionKey());
                 serverWorld.forceChunk(chunkPos.x, chunkPos.z, false);
             }
         }

src/main/java/appeng/debug/ReplicatorCardItem.java

@@ -101,7 +101,7 @@ public class ReplicatorCardItem extends AEBaseItem {
                 tag.putInt("y", y);
                 tag.putInt("z", z);
                 tag.putInt("side", side.ordinal());
-                tag.putString("w", world.func_234923_W_().func_240901_a_().toString());
+                tag.putString("w", world.getDimensionKey().getLocation().toString());
                 tag.putInt("r", 0);
 
                 this.outputMsg(player, "Set replicator source");
@@ -117,7 +117,7 @@ public class ReplicatorCardItem extends AEBaseItem {
                 final int src_side = ish.getInt("side");
                 final String worldId = ish.getString("w");
                 final World src_w = world.getServer()
-                        .getWorld(RegistryKey.func_240903_a_(Registry.WORLD_KEY, new ResourceLocation(worldId)));
+                        .getWorld(RegistryKey.getOrCreateKey(Registry.WORLD_KEY, new ResourceLocation(worldId)));
                 final int replications = ish.getInt("r") + 1;
 
                 final TileEntity te = src_w.getTileEntity(new BlockPos(src_x, src_y, src_z));

src/main/java/appeng/entity/GrowingCrystalEntity.java

@@ -176,7 +176,7 @@ public final class GrowingCrystalEntity extends AEBaseItemEntity {
 
         BlockPos.Mutable testPos = new BlockPos.Mutable();
         for (Direction direction : Direction.values()) {
-            if (this.isPoweredAccelerator(testPos.func_239622_a_(pos, direction))) {
+            if (this.isPoweredAccelerator(testPos.setAndMove(pos, direction))) {
                 count++;
             }
         }

src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java

@@ -158,7 +158,7 @@ public class FluidTerminalScreen extends AEBaseMEScreen<FluidTerminalContainer>
     }
 
     @Override
-    protected void func_230459_a_(MatrixStack matrixStack, int mouseX, int mouseY) {
+    protected void renderHoveredTooltip(MatrixStack matrixStack, int mouseX, int mouseY) {
         final Slot slot = this.getSlot(mouseX, mouseY);
 
         if (slot instanceof IMEFluidSlot && slot.isEnabled()) {
@@ -181,7 +181,7 @@ public class FluidTerminalScreen extends AEBaseMEScreen<FluidTerminalContainer>
                 return;
             }
         }
-        super.func_230459_a_(matrixStack, mouseX, mouseY);
+        super.renderHoveredTooltip(matrixStack, mouseX, mouseY);
     }
 
     private <S extends Enum<S>> void toggleServerSetting(SettingToggleButton<S> btn, boolean backwards) {

src/main/java/appeng/items/misc/CrystalSeedItem.java

@@ -111,7 +111,7 @@ public class CrystalSeedItem extends AEBaseItem implements IGrowableCrystal {
         }
 
         // Check for the normal supported fluid
-        if (world != null && world.func_234923_W_() == World.field_234919_h_) {
+        if (world != null && world.getDimensionKey() == World.THE_NETHER) {
             // In the nether, use Lava as the "normal" fluid
             return state.getFluidState().isTagged(FluidTags.LAVA) ? 1 : 0;
         } else {

src/main/java/appeng/items/misc/CrystalSeedRendering.java

@@ -23,7 +23,7 @@ public class CrystalSeedRendering implements IClientSetupComponent {
     @OnlyIn(Dist.CLIENT)
     public void setup() {
         // Expose the growth of the seed to the model system
-        ItemModelsProperties.func_239418_a_(item, new ResourceLocation("appliedenergistics2:growth"),
+        ItemModelsProperties.registerProperty(item, new ResourceLocation("appliedenergistics2:growth"),
                 (is, w, p) -> CrystalSeedItem.getGrowthTicks(is) / (float) CrystalSeedItem.GROWTH_TICKS_REQUIRED);
     }
 }

src/main/java/appeng/items/storage/SpatialStorageCellItem.java

@@ -143,7 +143,7 @@ public class SpatialStorageCellItem extends AEBaseItem implements ISpatialStorag
         }
 
         // Store some information about this transition in the plot
-        TransitionInfo info = new TransitionInfo(w.func_234923_W_().func_240901_a_(), min.getBlockPos(),
+        TransitionInfo info = new TransitionInfo(w.getDimensionKey().getLocation(), min.getBlockPos(),
                 max.getBlockPos(), Instant.now());
         manager.setLastTransition(plot.getId(), info);
 

src/main/java/appeng/me/cluster/implementations/QuantumCluster.java

@@ -162,7 +162,7 @@ public class QuantumCluster implements ILocatable, IAECluster {
                 // until the center
                 // tile begins ticking normally.
                 if (theWorld.isBlockLoaded(qc.center.getPos())) {
-                    final World cur = theWorld.getServer().getWorld(theWorld.func_234923_W_());
+                    final World cur = theWorld.getServer().getWorld(theWorld.getDimensionKey());
 
                     final TileEntity te = theWorld.getTileEntity(qc.center.getPos());
                     return te != qc.center || theWorld != cur;

src/main/java/appeng/mixins/feature/ConfiguredFeaturesAccessor.java

@@ -10,7 +10,7 @@ import net.minecraft.world.gen.feature.IFeatureConfig;
 @Mixin(Features.class)
 public interface ConfiguredFeaturesAccessor {
 
-    @Invoker("func_243968_a")
+    @Invoker("register")
     static <FC extends IFeatureConfig> ConfiguredFeature<FC, ?> register(String id,
             ConfiguredFeature<FC, ?> configuredFeature) {
         throw new AssertionError();

src/main/java/appeng/mixins/spatial/BiomesMixin.java

@@ -20,8 +20,8 @@ public class BiomesMixin {
 
     @Inject(method = "<clinit>", at = @At("TAIL"))
     private static void registerBiomes(CallbackInfo ci) {
-        WorldGenRegistries.func_243664_a(WorldGenRegistries.field_243657_i,
-                SpatialStorageDimensionIds.BIOME_KEY.func_240901_a_(), SpatialStorageBiome.INSTANCE);
+        WorldGenRegistries.register(WorldGenRegistries.BIOME, SpatialStorageDimensionIds.BIOME_KEY.getLocation(),
+                SpatialStorageBiome.INSTANCE);
     }
 
 }

src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java

@@ -39,28 +39,28 @@ public class DimensionTypeMixin {
         throw new AssertionError();
     }
 
-    @Inject(method = "func_236027_a_", at = @At("TAIL"))
+    @Inject(method = "registerTypes", at = @At("TAIL"))
     private static void addRegistryDefaults(DynamicRegistries.Impl registryTracker, CallbackInfoReturnable<?> cir) {
         DimensionType dimensionType = create(OptionalLong.of(12000), false, false, false, false, 1.0, false, false,
                 false, false, 256, BlockTags.INFINIBURN_OVERWORLD.getName(),
                 SpatialStorageDimensionIds.SKY_PROPERTIES_ID, 1.0f);
 
-        Registry.register(registryTracker.func_230520_a_(),
-                SpatialStorageDimensionIds.DIMENSION_TYPE_ID.func_240901_a_(), dimensionType);
+        Registry.register(registryTracker.func_230520_a_(), SpatialStorageDimensionIds.DIMENSION_TYPE_ID.getLocation(),
+                dimensionType);
     }
 
     /**
      * Insert our custom dimension into the initial registry. <em>This is what will
      * ultimately lead to the creation of a new World.</em>
      */
-    @Inject(method = "func_242718_a", at = @At("RETURN"))
+    @Inject(method = "getDefaultSimpleRegistry", at = @At("RETURN"))
     private static void buildDimensionRegistry(Registry<DimensionType> dimensionTypes, Registry<Biome> biomes,
             Registry<DimensionSettings> dimensionSettings, long seed,
             CallbackInfoReturnable<SimpleRegistry<Dimension>> cir) {
         SimpleRegistry<Dimension> simpleregistry = cir.getReturnValue();
 
         simpleregistry.register(SpatialStorageDimensionIds.DIMENSION_ID, new Dimension(() -> {
-            return dimensionTypes.func_243576_d(SpatialStorageDimensionIds.DIMENSION_TYPE_ID);
+            return dimensionTypes.getOrThrow(SpatialStorageDimensionIds.DIMENSION_TYPE_ID);
         }, new SpatialStorageChunkGenerator(biomes)), Lifecycle.stable());
 
     }

src/main/java/appeng/mixins/spatial/EntityMixin.java

@@ -22,7 +22,7 @@ public class EntityMixin {
     @Inject(method = "func_241829_a", at = @At("HEAD"), cancellable = true, allow = 1)
     public void getTeleportTarget(ServerWorld destination, CallbackInfoReturnable<PortalInfo> cri) {
         // Check if a destination has been set for the entity currently being teleported
-        if (destination.func_234923_W_() == SpatialStorageDimensionIds.WORLD_ID) {
+        if (destination.getDimensionKey() == SpatialStorageDimensionIds.WORLD_ID) {
             PortalInfo target = SpatialStorageHelper.getInstance().getTeleportTarget();
             if (target != null) {
                 cri.setReturnValue(target);

src/main/java/appeng/mixins/spatial/SkyRenderMixin.java

@@ -23,7 +23,7 @@ public class SkyRenderMixin {
     @SuppressWarnings("ConstantConditions")
     @Inject(method = "renderSky(Lcom/mojang/blaze3d/matrix/MatrixStack;F)V", at = @At("HEAD"), cancellable = true)
     public void renderSky(MatrixStack matrices, float tickDelta, CallbackInfo ci) {
-        if (mc.world.func_234923_W_() == SpatialStorageDimensionIds.WORLD_ID) {
+        if (mc.world.getDimensionKey() == SpatialStorageDimensionIds.WORLD_ID) {
             SpatialSkyRender.getInstance().render(matrices);
             ci.cancel();
         }

src/main/java/appeng/mixins/structure/BiomeAccessor.java

@@ -20,6 +20,6 @@ import net.minecraft.world.gen.feature.structure.Structure;
 public interface BiomeAccessor {
 
     @Accessor
-    Map<Integer, List<Structure<?>>> getField_242421_g();
+    Map<Integer, List<Structure<?>>> getBiomeStructures();
 
 }

src/main/java/appeng/mixins/structure/GenerationSettingsAccessor.java

@@ -16,16 +16,16 @@ import net.minecraft.world.gen.feature.StructureFeature;
 @Mixin(BiomeGenerationSettings.class)
 public interface GenerationSettingsAccessor {
 
-    @Accessor("field_242484_f")
+    @Accessor("features")
     List<List<Supplier<ConfiguredFeature<?, ?>>>> getFeatures();
 
-    @Accessor("field_242484_f")
+    @Accessor("features")
     void setFeatures(List<List<Supplier<ConfiguredFeature<?, ?>>>> features);
 
-    @Accessor("field_242485_g")
+    @Accessor("structures")
     List<Supplier<StructureFeature<?, ?>>> getStructureFeatures();
 
-    @Accessor("field_242485_g")
+    @Accessor("structures")
     void setStructureFeatures(List<Supplier<StructureFeature<?, ?>>> structureFeatures);
 
 }

src/main/java/appeng/parts/automation/FormationPlanePart.java

@@ -433,7 +433,7 @@ public class FormationPlanePart extends AbstractFormationPlanePart<IAEItemStack>
         }
 
         @Override
-        public boolean func_225518_g_() {
+        public boolean hasSecondaryUseForPlayer() {
             return false;
         }
 

src/main/java/appeng/parts/automation/PlaneBakedModel.java

@@ -101,7 +101,7 @@ public class PlaneBakedModel implements IDynamicBakedModel {
     }
 
     @Override
-    public boolean func_230044_c_() {
+    public boolean isSideLit() {
         return false;// TODO
     }
 

src/main/java/appeng/server/subcommands/SpatialStorageCommand.java

@@ -90,7 +90,7 @@ public class SpatialStorageCommand implements ISubCommand {
      */
     private void teleportBack(CommandSource source) {
 
-        if (source.getWorld().func_234923_W_() != SpatialStorageDimensionIds.WORLD_ID) {
+        if (source.getWorld().getDimensionKey() != SpatialStorageDimensionIds.WORLD_ID) {
             throw new CommandException(new StringTextComponent("Must be within the spatial storage world."));
         }
 
@@ -156,7 +156,7 @@ public class SpatialStorageCommand implements ISubCommand {
         sendKeyValuePair(source, "Size", formatBlockPos(plot.getSize(), "x"));
 
         // Show the plot's origin and make it clickable to teleport directly to it
-        String teleportToPlotCommand = getTeleportCommand(SpatialStorageDimensionIds.WORLD_ID.func_240901_a_(),
+        String teleportToPlotCommand = getTeleportCommand(SpatialStorageDimensionIds.WORLD_ID.getLocation(),
                 plot.getOrigin());
         sendKeyValuePair(source, "Origin", new StringTextComponent(formatBlockPos(plot.getOrigin(), ","))
                 .modifyStyle(makeCommandLink(teleportToPlotCommand, "Teleport into plot")));
@@ -188,7 +188,7 @@ public class SpatialStorageCommand implements ISubCommand {
     private static void teleportToPlot(CommandSource source, int plotId) {
         SpatialStoragePlot plot = getPlot(plotId);
 
-        String teleportCommand = getTeleportCommand(SpatialStorageDimensionIds.WORLD_ID.func_240901_a_(),
+        String teleportCommand = getTeleportCommand(SpatialStorageDimensionIds.WORLD_ID.getLocation(),
                 plot.getOrigin());
 
         runCommandFor(source, teleportCommand);
@@ -302,7 +302,7 @@ public class SpatialStorageCommand implements ISubCommand {
      * Gets the spatial storage plot that the command source is currently in.
      */
     private static SpatialStoragePlot getCurrentPlot(CommandSource source) {
-        if (source.getWorld().func_234923_W_() != SpatialStorageDimensionIds.WORLD_ID) {
+        if (source.getWorld().getDimensionKey() != SpatialStorageDimensionIds.WORLD_ID) {
             throw new CommandException(new StringTextComponent("Must be within the spatial storage world."));
         }
 

src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java

@@ -87,8 +87,8 @@ public class TestMeteoritesCommand implements ISubCommand {
             world = player.getServerWorld();
             centerBlock = new BlockPos(player.getPosX(), 0, player.getPosZ());
         } else {
-            world = srv.getWorld(World.field_234918_g_);
-            centerBlock = world.func_241135_u_();
+            world = srv.getWorld(World.OVERWORLD);
+            centerBlock = world.getSpawnPoint();
         }
 
         ChunkPos center = new ChunkPos(centerBlock);
@@ -172,7 +172,7 @@ public class TestMeteoritesCommand implements ISubCommand {
             msg.append(getClickablePosition(world, settings, pos)).append(restOfLine);
 
             // Add a tooltip
-            String biomeId = world.func_242406_i(pos).map(bk -> bk.func_240901_a_().toString()).orElse("unknown");
+            String biomeId = world.func_242406_i(pos).map(bk -> bk.getLocation().toString()).orElse("unknown");
             ITextComponent tooltip = new StringTextComponent(settings.toString() + "\nBiome: ").deepCopy()
                     .appendString(biomeId);
             msg.modifyStyle(style -> style.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, tooltip)));

src/main/java/appeng/server/subcommands/TestOreGenCommand.java

@@ -68,8 +68,8 @@ public class TestOreGenCommand implements ISubCommand {
             world = player.getServerWorld();
             center = new BlockPos(player.getPosX(), 0, player.getPosZ());
         } catch (CommandSyntaxException e) {
-            world = srv.getWorld(World.field_234918_g_);
-            center = world.func_241135_u_();
+            world = srv.getWorld(World.OVERWORLD);
+            center = world.getSpawnPoint();
         }
 
         ChunkPos tl = new ChunkPos(center.add(-radius, 0, -radius));

src/main/java/appeng/spatial/SpatialStorageBiome.java

@@ -31,14 +31,14 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
 public class SpatialStorageBiome {
 
     public static final Biome INSTANCE = new Biome.Builder()
-            .func_242457_a(new BiomeGenerationSettings.Builder().func_242517_a(
+            .withGenerationSettings(new BiomeGenerationSettings.Builder().withSurfaceBuilder(
                     new ConfiguredSurfaceBuilder<>(SurfaceBuilder.NOPE, SurfaceBuilder.STONE_STONE_GRAVEL_CONFIG))
-                    .func_242508_a())
+                    .build())
             .precipitation(Biome.RainType.NONE).category(Biome.Category.NONE).depth(0).scale(1)
             // Copied from the vanilla void biome
             .temperature(0.5F).downfall(0.5F)
-            .func_235097_a_(new BiomeAmbience.Builder().setWaterColor(4159204).setWaterFogColor(329011).setFogColor(0)
-                    .func_242539_d(0x111111).build())
-            .func_242458_a(new MobSpawnInfo.Builder().func_242572_a(0).func_242577_b()).func_242455_a();
+            .setEffects(new BiomeAmbience.Builder().setWaterColor(4159204).setWaterFogColor(329011).setFogColor(0)
+                    .withSkyColor(0x111111).build())
+            .withMobSpawnSettings(new MobSpawnInfo.Builder().withCreatureSpawnProbability(0).copy()).build();
 
 }

src/main/java/appeng/spatial/SpatialStorageChunkGenerator.java

@@ -58,7 +58,7 @@ public class SpatialStorageChunkGenerator extends ChunkGenerator {
      * uses an identity hashmap internally.
      */
     public static final Codec<SpatialStorageChunkGenerator> CODEC = RegistryLookupCodec
-            .func_244331_a(Registry.BIOME_KEY)
+            .getLookUpCodec(Registry.BIOME_KEY)
             .xmap(SpatialStorageChunkGenerator::new, SpatialStorageChunkGenerator::getBiomeRegistry).stable().codec();
 
     private final Registry<Biome> biomeRegistry;
@@ -85,8 +85,7 @@ public class SpatialStorageChunkGenerator extends ChunkGenerator {
     }
 
     private static SingleBiomeProvider createBiomeSource(Registry<Biome> biomeRegistry) {
-        return new SingleBiomeProvider(
-                biomeRegistry.func_243576_d/* getOrThrow */(SpatialStorageDimensionIds.BIOME_KEY));
+        return new SingleBiomeProvider(biomeRegistry.getOrThrow(SpatialStorageDimensionIds.BIOME_KEY));
     }
 
     public Registry<Biome> getBiomeRegistry() {

src/main/java/appeng/spatial/SpatialStorageDimensionIds.java

@@ -22,7 +22,7 @@ public final class SpatialStorageDimensionIds {
      * This is defined in {@link DimensionTypeMixin}.
      */
     public static final RegistryKey<DimensionType> DIMENSION_TYPE_ID = RegistryKey
-            .func_240903_a_(Registry.DIMENSION_TYPE_KEY, AppEng.makeId("spatial_storage"));
+            .getOrCreateKey(Registry.DIMENSION_TYPE_KEY, AppEng.makeId("spatial_storage"));
 
     /**
      * ID of the {@link net.minecraft.world.gen.ChunkGenerator} used for the spatial
@@ -34,7 +34,7 @@ public final class SpatialStorageDimensionIds {
      * ID of the {@link net.minecraft.world.biome.Biome} used for the spatial
      * storage world.
      */
-    public static final RegistryKey<Biome> BIOME_KEY = RegistryKey.func_240903_a_(Registry.BIOME_KEY,
+    public static final RegistryKey<Biome> BIOME_KEY = RegistryKey.getOrCreateKey(Registry.BIOME_KEY,
             AppEng.makeId("spatial_storage"));
 
     /**
@@ -42,14 +42,14 @@ public final class SpatialStorageDimensionIds {
      * <p>
      * This is defined in {@link appeng.mixins.spatial.DimensionTypeMixin}.
      */
-    public static final RegistryKey<Dimension> DIMENSION_ID = RegistryKey.func_240903_a_(Registry.DIMENSION_KEY,
+    public static final RegistryKey<Dimension> DIMENSION_ID = RegistryKey.getOrCreateKey(Registry.DIMENSION_KEY,
             AppEng.makeId("spatial_storage"));
 
     /**
      * ID of the {@link World} that is instantiated from the dimension/dimension
      * type.
      */
-    public static final RegistryKey<World> WORLD_ID = RegistryKey.func_240903_a_(Registry.WORLD_KEY,
+    public static final RegistryKey<World> WORLD_ID = RegistryKey.getOrCreateKey(Registry.WORLD_KEY,
             AppEng.makeId("spatial_storage"));
 
     /**

src/main/java/appeng/spatial/SpatialStorageHelper.java

@@ -109,7 +109,7 @@ public class SpatialStorageHelper {
         newWorld.getChunkProvider().getChunk(MathHelper.floor(link.x) >> 4, MathHelper.floor(link.z) >> 4,
                 ChunkStatus.FULL, true);
 
-        if (entity instanceof ServerPlayerEntity && link.dim.func_234923_W_() == SpatialStorageDimensionIds.WORLD_ID) {
+        if (entity instanceof ServerPlayerEntity && link.dim.getDimensionKey() == SpatialStorageDimensionIds.WORLD_ID) {
             AppEng.instance().getAdvancementTriggers().getSpatialExplorer().trigger((ServerPlayerEntity) entity);
         }
 

src/main/java/appeng/worldgen/BiomeModifier.java

@@ -25,7 +25,7 @@ public final class BiomeModifier {
     @SuppressWarnings("ConstantConditions")
     public BiomeModifier(Biome biome) {
         this.biomeAccessor = (BiomeAccessor) (Object) biome;
-        this.generationSettingsAccessor = (GenerationSettingsAccessor) biome.func_242440_e();
+        this.generationSettingsAccessor = (GenerationSettingsAccessor) biome.getGenerationSettings();
     }
 
     public void addFeature(GenerationStage.Decoration step, ConfiguredFeature<?, ?> feature) {
@@ -55,7 +55,7 @@ public final class BiomeModifier {
         // Add it to the structures that will generate pieces within this biome,
         // this is only half-correct since a structure can start in an adjacent biome
         // and extend into biomes that would usually not start the structure
-        Map<Integer, List<Structure<?>>> structuresByStage = biomeAccessor.getField_242421_g();
+        Map<Integer, List<Structure<?>>> structuresByStage = biomeAccessor.getBiomeStructures();
         int step = structure.field_236268_b_.func_236396_f_().ordinal();
         if (!structuresByStage.containsKey(step)) {
             structuresByStage.put(step, new ArrayList<>());

src/main/java/appeng/worldgen/ChargedQuartzOreConfig.java

@@ -13,8 +13,8 @@ import net.minecraft.world.gen.feature.ReplaceBlockConfig;
 public class ChargedQuartzOreConfig implements IFeatureConfig {
 
     public static final Codec<ChargedQuartzOreConfig> CODEC = RecordCodecBuilder.create((instance) -> instance
-            .group(BlockState.BLOCKSTATE_CODEC.fieldOf("target").forGetter((config) -> config.target),
-                    BlockState.BLOCKSTATE_CODEC.fieldOf("state").forGetter((config) -> config.state),
+            .group(BlockState.CODEC.fieldOf("target").forGetter((config) -> config.target),
+                    BlockState.CODEC.fieldOf("state").forGetter((config) -> config.state),
                     Codec.FLOAT.fieldOf("chance").orElse(0f).forGetter((config) -> config.chance))
             .apply(instance, ChargedQuartzOreConfig::new));
 

src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java

@@ -27,9 +27,9 @@ import appeng.worldgen.meteorite.fallout.FalloutMode;
 
 public class MeteoriteStructureStart extends StructureStart<NoFeatureConfig> {
 
-    private final ITag<Block> sandTag = BlockTags.getCollection().func_241834_b(new ResourceLocation("minecraft:sand"));
+    private final ITag<Block> sandTag = BlockTags.getCollection().getTagByID(new ResourceLocation("minecraft:sand"));
     private final ITag<Block> terracottaTag = BlockTags.getCollection()
-            .func_241834_b(new ResourceLocation("forge:terracotta"));
+            .getTagByID(new ResourceLocation("forge:terracotta"));
 
     public MeteoriteStructureStart(Structure<NoFeatureConfig> p_i225815_1_, int p_i225815_2_, int p_i225815_3_,
             MutableBoundingBox p_i225815_4_, int p_i225815_5_, long p_i225815_6_) {
@@ -76,7 +76,8 @@ public class MeteoriteStructureStart extends StructureStart<NoFeatureConfig> {
         boolean craterLake = this.locateWaterAroundTheCrater(generator, actualPos, meteoriteRadius);
         CraterType craterType = this.determineCraterType(spawnBiome);
         boolean pureCrater = this.rand.nextFloat() > .9f;
-        FalloutMode fallout = getFalloutFromBaseBlock(spawnBiome.func_242440_e().func_242502_e().getTop());
+        FalloutMode fallout = getFalloutFromBaseBlock(
+                spawnBiome.getGenerationSettings().getSurfaceBuilderConfig().getTop());
 
         components.add(
                 new MeteoriteStructurePiece(actualPos, meteoriteRadius, craterType, fallout, pureCrater, craterLake));
@@ -121,7 +122,7 @@ public class MeteoriteStructureStart extends StructureStart<NoFeatureConfig> {
     private CraterType determineCraterType(Biome biome) {
         // The temperature thresholds below are taken from older Vanilla code
         // (temperature categories)
-        final float temp = biome.func_242445_k();
+        final float temp = biome.getTemperature();
         final Category category = biome.getCategory();
 
         // No craters in oceans

src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java

@@ -36,7 +36,7 @@ public class FalloutCopy extends Fallout {
     public FalloutCopy(final IWorld w, BlockPos pos, final MeteoriteBlockPutter putter, final BlockState skyStone) {
         super(putter, skyStone);
         this.putter = putter;
-        this.block = w.getBiome(pos).func_242440_e().func_242502_e().getTop();
+        this.block = w.getBiome(pos).getGenerationSettings().getSurfaceBuilderConfig().getTop();
     }
 
     @Override