Actually update forge. Change stuff around to compile with the default forge mappings.

This commit is contained in:
Vasco Lavos committed 2016-09-05 23:53:25 +01:00
1 parent e7753d0a79
commit c6f9103b31
19 files changed
+34 -44

No files matched your search

@@ -85,9 +85,9 @@ public class MultiblockBlockAccess implements IBlockAccess {
@Nonnull
@Override
public Biome getBiome(@Nonnull BlockPos pos) {
public Biome getBiomeGenForCoords(@Nonnull BlockPos pos) {
if(hasBlockAccess)
return originalBlockAccess.getBiome(pos);
return originalBlockAccess.getBiomeGenForCoords(pos);
return null;
}
@@ -146,8 +146,8 @@ public class PlatformModel implements IBakedModel {
@Nonnull
@Override
public Biome getBiome(@Nonnull BlockPos pos) {
return compose.getBiome(pos);
public Biome getBiomeGenForCoords(@Nonnull BlockPos pos) {
return compose.getBiomeGenForCoords(pos);
}
@Override
@@ -63,7 +63,7 @@ public class RenderTileGaiaHead extends TileEntitySkullRenderer {
profile = ((EntityPlayer) mc.getRenderViewEntity()).getGameProfile();
} else if (view instanceof EntitySkeleton) {
skullType = 0;
if (((EntitySkeleton) view).getSkeletonType() == SkeletonType.WITHER)
if (((EntitySkeleton) view).func_189771_df() == SkeletonType.WITHER)
skullType = 1;
} else if(view instanceof EntityWither)
skullType = 1;
@@ -348,7 +348,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
} else if (name.equals("williewillus")) {
GlStateManager.rotate(180F, 1F, 0F, 0F);
mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
renderItem(new ItemStack(Blocks.RED_NETHER_BRICK));
renderItem(new ItemStack(Blocks.field_189879_dh));
GlStateManager.scale(0.75F, 0.75F, 0.75F);
GlStateManager.translate(-1.1F, -1.25F, 0F);
renderItem(new ItemStack(Blocks.CHORUS_FLOWER));
@@ -36,7 +36,7 @@ public class BlockFakeAir extends BlockMod {
private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 0, 0, 0);
public BlockFakeAir() {
super(Material.STRUCTURE_VOID, LibBlockNames.FAKE_AIR);
super(Material.field_189963_J, LibBlockNames.FAKE_AIR);
setTickRandomly(true);
}
@@ -10,6 +10,11 @@
*/
package vazkii.botania.common.block.decor;
import java.util.List;
import java.util.Random;
import javax.annotation.Nonnull;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDirt;
import net.minecraft.block.BlockMushroom;
@@ -40,8 +45,6 @@ import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.IRegisterCallback;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
@@ -49,10 +52,6 @@ import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import java.util.List;
import java.util.Random;
@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true)
public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable, IModelRegister {
@@ -10,6 +10,8 @@
*/
package vazkii.botania.common.block.decor.panes;
import javax.annotation.Nonnull;
import net.minecraft.block.Block;
import net.minecraft.block.BlockPane;
import net.minecraft.block.SoundType;
@@ -20,14 +22,11 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.block.IRegisterCallback;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.item.block.ItemBlockMod;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
public class BlockModPane extends BlockPane implements IModelRegister {
public BlockModPane(Block source) {
@@ -1,5 +1,10 @@
package vazkii.botania.common.block.decor.slabs;
import java.util.Locale;
import java.util.Random;
import javax.annotation.Nonnull;
import net.minecraft.block.BlockSlab;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
@@ -23,18 +28,11 @@ import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.IRegisterCallback;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.item.block.ItemBlockModSlab;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import java.util.Locale;
import java.util.Random;
public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IModelRegister {
private final String name;
@@ -16,8 +16,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.block.IRegisterCallback;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.item.block.ItemBlockMod;
import vazkii.botania.common.lexicon.LexiconData;
@@ -10,6 +10,10 @@
*/
package vazkii.botania.common.block.decor.walls;
import java.util.List;
import javax.annotation.Nonnull;
import net.minecraft.block.Block;
import net.minecraft.block.BlockWall;
import net.minecraft.block.state.BlockStateContainer;
@@ -19,7 +23,6 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
@@ -30,15 +33,9 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.block.IRegisterCallback;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.item.block.ItemBlockMod;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import java.util.List;
public abstract class BlockModWall extends BlockWall implements ILexiconable, IModelRegister {
@@ -75,7 +75,7 @@ public class SubTileMarimorphosis extends SubTileFunctional {
}
public ItemStack getStoneToPut(BlockPos coords) {
List<Type> types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorld().getBiome(coords)));
List<Type> types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorld().getBiomeGenForCoords(coords)));
TIntArrayList values = new TIntArrayList();
for(int i = 0; i < 8; i++) {
@@ -59,7 +59,7 @@ public class SubTileDaybloom extends SubTilePassiveGenerating {
@Override
public boolean canGeneratePassively() {
boolean rain = supertile.getWorld().getBiome(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering());
boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering());
return supertile.getWorld().isDaytime() && !rain && supertile.getWorld().canBlockSeeSky(supertile.getPos().up());
}
@@ -180,7 +180,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating {
@Override
public int getDelayBetweenPassiveGeneration() {
boolean rain = supertile.getWorld().getBiome(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering());
boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering());
return rain ? 1 : 2;
}
@@ -36,8 +36,8 @@ public final class BiomeDecorationHandler {
boolean flowers = true;
if(event.getWorld().provider instanceof IFlowerlessWorld)
flowers = ((IFlowerlessWorld) event.getWorld().provider).generateFlowers(event.getWorld());
else if(event.getWorld().getBiome(event.getPos()) instanceof IFlowerlessBiome)
flowers = ((IFlowerlessBiome) event.getWorld().getBiome(event.getPos())).canGenerateFlowers(event.getWorld(), event.getPos().getX(), event.getPos().getZ());
else if(event.getWorld().getBiomeGenForCoords(event.getPos()) instanceof IFlowerlessBiome)
flowers = ((IFlowerlessBiome) event.getWorld().getBiomeGenForCoords(event.getPos())).canGenerateFlowers(event.getWorld(), event.getPos().getX(), event.getPos().getZ());
if(!flowers)
return;
@@ -638,7 +638,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss {
entity = new EntitySkeleton(worldObj);
entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(Items.BOW));
if(worldObj.rand.nextInt(8) == 0) {
((EntitySkeleton) entity).setSkeletonType(SkeletonType.WITHER);
((EntitySkeleton) entity).func_189768_a(SkeletonType.WITHER);
entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(hard ? ModItems.elementiumSword : Items.STONE_SWORD));
}
break;
@@ -252,7 +252,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet
TileEntity tile = null;
NBTTagCompound tilecmp = ItemNBTHelper.getCompound(lens, TAG_TILE, false);
if(tilecmp.hasKey("id"))
tile = TileEntity.create(entity.worldObj, tilecmp);
tile = TileEntity.func_190200_a(entity.worldObj, tilecmp);
entity.worldObj.setBlockState(pos, block.getStateFromMeta(meta), 1 | 2);
entity.worldObj.playEvent(2001, pos, Block.getStateId(block.getStateFromMeta(meta)));
@@ -42,7 +42,7 @@ public class ItemElementiumAxe extends ItemManasteelAxe {
int looting = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, weapon);
if(event.getEntityLiving() instanceof EntitySkeleton && rand.nextInt(26) <= 3 + looting)
addDrop(event, new ItemStack(Items.SKULL, 1, ((EntitySkeleton) event.getEntityLiving()).getSkeletonType().ordinal()));
addDrop(event, new ItemStack(Items.SKULL, 1, ((EntitySkeleton) event.getEntityLiving()).func_189771_df().ordinal()));
else if(event.getEntityLiving() instanceof EntityZombie && !(event.getEntityLiving() instanceof EntityPigZombie) && rand.nextInt(26) <= 2 + 2 * looting)
addDrop(event, new ItemStack(Items.SKULL, 1, 2));
else if(event.getEntityLiving() instanceof EntityCreeper && rand.nextInt(26) <= 2 + 2 * looting)