Update mappings, move mod initialization to the async loader.

Signed-off-by: cpw <[email protected]>
This commit is contained in:
cpw committed 2019-06-21 22:42:16 -04:00
1 parent a14c2233e0
commit c10174d50d
35 files changed
+166 -214

No files matched your search

@@ -206,7 +206,7 @@ public class DimensionManager
Validate.notNull(overworld, "Cannot Hotload Dim: Overworld is not Loaded!");
@SuppressWarnings("resource")
ServerWorld world = new ServerMultiWorld(overworld, server, server.func_213207_aT(), overworld.func_217485_w(), dim, server.func_213185_aS(), new NoopChunkStatusListener());
ServerWorld world = new ServerMultiWorld(overworld, server, server.getBackgroundExecutor(), overworld.getSaveHandler(), dim, server.getProfiler(), new NoopChunkStatusListener());
if (!server.isSinglePlayer())
world.getWorldInfo().setGameType(server.getGameType());
server.forgeGetWorldMap().put(dim, world);
@@ -218,7 +218,7 @@ public class DimensionManager
private static boolean canUnloadWorld(ServerWorld world)
{
return world.func_217469_z().isEmpty()
return world.getForcedChunks().isEmpty()
&& world.getPlayers().isEmpty()
//&& !world.dimension.getType().shouldLoadSpawn()
&& !getData(world.getDimension().getType()).keepLoaded;
@@ -274,7 +274,7 @@ public class DimensionManager
}
try
{
w.func_217445_a(null, true, true);
w.save(null, true, true);
}
catch (Exception e)
{
@@ -237,7 +237,7 @@ public class ForgeHooks
public static boolean onPickBlock(RayTraceResult target, PlayerEntity player, World world)
{
ItemStack result = ItemStack.EMPTY;
boolean isCreative = player.playerAbilities.isCreativeMode;
boolean isCreative = player.abilities.isCreativeMode;
TileEntity te = null;
if (target.getType() == RayTraceResult.Type.BLOCK)
@@ -274,7 +274,7 @@ public class ForgeHooks
if (isCreative)
{
player.inventory.setPickedItemStack(result);
Minecraft.getInstance().field_71442_b.sendSlotPacket(player.getHeldItem(Hand.MAIN_HAND), 36 + player.inventory.currentItem);
Minecraft.getInstance().playerController.sendSlotPacket(player.getHeldItem(Hand.MAIN_HAND), 36 + player.inventory.currentItem);
return true;
}
int slot = player.inventory.getSlotFor(result);
@@ -283,7 +283,7 @@ public class ForgeHooks
if (PlayerInventory.isHotbar(slot))
player.inventory.currentItem = slot;
else
Minecraft.getInstance().field_71442_b.pickItem(slot);
Minecraft.getInstance().playerController.pickItem(slot);
return true;
}
return false;
@@ -431,14 +431,14 @@ public class ForgeHooks
return null;
if (!player.world.isRemote)
player.getEntityWorld().func_217376_c(event.getEntityItem());
player.getEntityWorld().addEntity(event.getEntityItem());
return event.getEntityItem();
}
@Nullable
public static ITextComponent onServerChatEvent(ServerPlayNetHandler net, String raw, ITextComponent comp)
{
ServerChatEvent event = new ServerChatEvent(net.field_147369_b, raw, comp);
ServerChatEvent event = new ServerChatEvent(net.player, raw, comp);
if (MinecraftForge.EVENT_BUS.post(event))
{
return null;
@@ -20,8 +20,6 @@
package net.minecraftforge.common;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.BrandingControl;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.ExtensionPoint;
import net.minecraftforge.fml.FMLWorldPersistenceHook;
import net.minecraftforge.fml.ModLoadingContext;
@@ -43,13 +41,10 @@ import org.apache.commons.lang3.tuple.Pair;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import net.minecraft.client.Minecraft;
import net.minecraft.data.DataGenerator;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.resources.SimpleReloadableResourceManager;
import net.minecraft.world.storage.SaveHandler;
import net.minecraft.world.storage.WorldInfo;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.common.data.ForgeBlockTagsProvider;
import net.minecraftforge.common.data.ForgeItemTagsProvider;
import net.minecraftforge.common.model.animation.CapabilityAnimation;
@@ -57,7 +52,6 @@ import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.fml.event.lifecycle.GatherDataEvent;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.resource.ISelectiveResourceReloadListener;
import net.minecraftforge.fluids.UniversalBucket;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
@@ -143,13 +137,6 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook
{
VersionChecker.startVersionCheck();
}
// Brandings need to recompute when language changes
DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> {
Minecraft mc = Minecraft.getInstance();
if (mc != null)
((SimpleReloadableResourceManager)mc.getResourceManager()).func_219534_a((ISelectiveResourceReloadListener) BrandingControl::clearCaches);
});
}
/*
@@ -49,7 +49,7 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
getBuilder(Tags.Items.DYES_BROWN).add(Items.COCOA_BEANS);
getBuilder(Tags.Items.DYES_CYAN).add(Items.CYAN_DYE);
getBuilder(Tags.Items.DYES_GRAY).add(Items.GRAY_DYE);
getBuilder(Tags.Items.DYES_GREEN).add(Items.field_222079_lj);
getBuilder(Tags.Items.DYES_GREEN).add(Items.GREEN_DYE);
getBuilder(Tags.Items.DYES_LIGHT_BLUE).add(Items.LIGHT_BLUE_DYE);
getBuilder(Tags.Items.DYES_LIGHT_GRAY).add(Items.LIGHT_GRAY_DYE);
getBuilder(Tags.Items.DYES_LIME).add(Items.LIME_DYE);
@@ -57,9 +57,9 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
getBuilder(Tags.Items.DYES_ORANGE).add(Items.ORANGE_DYE);
getBuilder(Tags.Items.DYES_PINK).add(Items.PINK_DYE);
getBuilder(Tags.Items.DYES_PURPLE).add(Items.PURPLE_DYE);
getBuilder(Tags.Items.DYES_RED).add(Items.field_222078_li);
getBuilder(Tags.Items.DYES_RED).add(Items.RED_DYE);
getBuilder(Tags.Items.DYES_WHITE).add(Items.BONE_MEAL);
getBuilder(Tags.Items.DYES_YELLOW).add(Items.field_222081_ls);
getBuilder(Tags.Items.DYES_YELLOW).add(Items.YELLOW_DYE);
copy(Tags.Blocks.FENCE_GATES, Tags.Items.FENCE_GATES);
copy(Tags.Blocks.FENCE_GATES_WOODEN, Tags.Items.FENCE_GATES_WOODEN);
copy(Tags.Blocks.FENCES, Tags.Items.FENCES);
@@ -697,7 +697,7 @@ public interface IForgeBlock
*/
default boolean shouldCheckWeakPower(BlockState state, IWorldReader world, BlockPos pos, Direction side)
{
return state.func_215686_e(world, pos);
return state.isNormalCube(world, pos);
}
/**
@@ -807,7 +807,7 @@ public interface IForgeBlock
LivingEntity ent = (LivingEntity)entity;
f12 = (float) EnchantmentHelper.getRespirationModifier(ent) * 0.2F;
if (ent.isPotionActive(Effects.field_76427_o))
if (ent.isPotionActive(Effects.WATER_BREATHING))
{
f12 = f12 * 0.3F + 0.6F;
}
@@ -968,7 +968,7 @@ public interface IForgeBlock
{
if (entity instanceof EnderDragonEntity)
{
return !BlockTags.field_219754_W.contains(this.getBlock());
return !BlockTags.DRAGON_IMMUNE.contains(this.getBlock());
}
else if ((entity instanceof WitherEntity) ||
(entity instanceof WitherSkullEntity))
@@ -159,7 +159,7 @@ public interface IForgeEntity extends ICapabilitySerializable<CompoundNBT>
*/
default EntityClassification getClassification(boolean forSpawnCount)
{
return getEntity().getType().getClassiciation();
return getEntity().getType().getClassification();
}
/**
@@ -603,7 +603,7 @@ public interface IForgeItem
*/
default boolean canApplyAtEnchantingTable(ItemStack stack, net.minecraft.enchantment.Enchantment enchantment)
{
return enchantment.field_77351_y.canEnchantItem(stack.getItem());
return enchantment.type.canEnchantItem(stack.getItem());
}
/**
@@ -111,7 +111,7 @@ public interface IForgeItemStack extends ICapabilitySerializable<CompoundNBT>
PlayerEntity entityplayer = context.getPlayer();
BlockPos blockpos = context.getPos();
CachedBlockInfo blockworldstate = new CachedBlockInfo(context.getWorld(), blockpos, false);
if (entityplayer != null && !entityplayer.playerAbilities.allowEdit && !getStack().canPlaceOn(context.getWorld().getTags(), blockworldstate)) {
if (entityplayer != null && !entityplayer.abilities.allowEdit && !getStack().canPlaceOn(context.getWorld().getTags(), blockworldstate)) {
return ActionResultType.PASS;
} else {
Item item = getStack().getItem();
@@ -65,9 +65,9 @@ public interface IForgeWorldType
default void onCustomizeButton(Minecraft mc, CreateWorldScreen gui)
{
if (this == WorldType.FLAT)
mc.displayGuiScreen(new CreateFlatWorldScreen(gui, gui.field_146334_a));
mc.displayGuiScreen(new CreateFlatWorldScreen(gui, gui.chunkProviderSettingsJson));
else if (this == WorldType.BUFFET)
mc.displayGuiScreen(new CreateBuffetWorldScreen(gui, gui.field_146334_a));
mc.displayGuiScreen(new CreateBuffetWorldScreen(gui, gui.chunkProviderSettingsJson));
}
default boolean handleSlimeSpawnReduction(java.util.Random random, World world)