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

@@ -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)