etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated to the latest Forge. Closes #730

This commit is contained in:
Adubbz 2016-04-03 16:35:12 +10:00
parent d874078dc3
commit f00b3e9c60
5 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@ -1,4 +1,4 @@
minecraft_version=1.9
forge_version=12.16.0.1807-1.9
forge_version=12.16.0.1829-1.9
mod_version=4.0.0
mappings_version=snapshot_nodoc_20160324

26
src/main/java/biomesoplenty/common/init/ModBlocks.java
View File

@ -87,6 +87,7 @@ import net.minecraft.item.ItemBucket;
import net.minecraft.item.ItemDoor;
import net.minecraft.item.ItemSlab;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ColorizerFoliage;
import net.minecraft.world.ColorizerGrass;
@ -97,6 +98,7 @@ import net.minecraftforge.fluids.BlockFluidBase;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fml.common.registry.GameData;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -322,9 +324,9 @@ public class ModBlocks
}
public static Block registerFluidBlock(Fluid fluid, BlockFluidBase fluidBlock, String name)
public static Block registerFluidBlock(Fluid fluid, Block fluidBlock, String name)
{
Block block = GameRegistry.registerBlock(fluidBlock, null, name);
Block block = GameRegistry.register(fluidBlock, new ResourceLocation(BiomesOPlenty.MOD_ID, name));
BiomesOPlenty.proxy.registerFluidBlockRendering(block, name);
fluid.setBlock(fluidBlock);
return block;
@ -365,8 +367,8 @@ public class ModBlocks
{
// if this block supports the IBOPBlock interface then we can determine the item block class, and sub-blocks automatically
IBOPBlock bopBlock = (IBOPBlock)block;
GameRegistry.registerBlock(block, bopBlock.getItemClass(), blockName);
registerBlockWithItem(block, blockName, bopBlock.getItemClass());
BiomesOPlenty.proxy.registerBlockSided(block);
// check for missing default states
@ -398,11 +400,27 @@ public class ModBlocks
else
{
// for vanilla blocks, just register a single variant with meta=0 and assume ItemBlock for the item class
GameRegistry.registerBlock(block, ItemBlock.class , blockName);
registerBlockWithItem(block, blockName, ItemBlock.class);
registerBlockVariant(block, blockName, 0);
}
return block;
}
private static void registerBlockWithItem(Block block, String blockName, Class<? extends ItemBlock> clazz)
{
try
{
Item itemBlock = clazz != null ? (Item)clazz.getConstructor(Block.class).newInstance(block) : null;
ResourceLocation location = new ResourceLocation(BiomesOPlenty.MOD_ID, blockName);
GameRegistry.register(block, location);
if (itemBlock != null) GameRegistry.register(itemBlock, location);
}
catch (Exception e)
{
throw new RuntimeException("An error occurred associating an item block during registration...");
}
}
}

4
src/main/java/biomesoplenty/common/init/ModHandlers.java
View File

@ -42,7 +42,7 @@ public class ModHandlers
MinecraftForge.EVENT_BUS.register(new PotionPossessionEventHandler());
MinecraftForge.EVENT_BUS.register(new ItemEventHandler());
MinecraftForge.EVENT_BUS.register(new UseHoeEventHandler());
FMLCommonHandler.instance().bus().register(new AchievementEventHandler());
MinecraftForge.EVENT_BUS.register(new AchievementEventHandler());
if (FMLCommonHandler.instance().getSide() == Side.CLIENT)
{
@ -54,6 +54,6 @@ public class ModHandlers
private static void registerClientEvents()
{
MinecraftForge.EVENT_BUS.register(new GuiEventHandler());
FMLCommonHandler.instance().bus().register(new TrailsEventHandler());
MinecraftForge.EVENT_BUS.register(new TrailsEventHandler());
}
}

3
src/main/java/biomesoplenty/common/init/ModItems.java
View File

@ -310,7 +310,8 @@ public class ModItems
{
item.setCreativeTab(CreativeTabBOP.instance);
}
GameRegistry.registerItem(item,name);
GameRegistry.register(item, new ResourceLocation(BiomesOPlenty.MOD_ID, name));
BOPCommand.itemCount++;
BiomesOPlenty.proxy.registerItemSided(item);

2
src/main/java/biomesoplenty/core/ClientProxy.java
View File

@ -160,7 +160,7 @@ public class ClientProxy extends CommonProxy
}
else
{
ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(BiomesOPlenty.MOD_ID + ":" + item.delegate.getResourceName().getResourcePath(), "inventory"));
ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(BiomesOPlenty.MOD_ID + ":" + item.delegate.name().getResourcePath(), "inventory"));
}
//Register colour handlers