Skip to content
This repository was archived by the owner on Mar 9, 2024. It is now read-only.

Commit 4c9e8e8

Browse files
renevorenevo
committed
Updated to 1.9.4 #29
Fixed an issue where the brick recipes returned the wrong amounts Closes #34 Added cobblestone to ore dictionary Closes #33
1 parent 4c2b971 commit 4c9e8e8

22 files changed

+138
-136
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ buildscript {
1515
}
1616
}
1717
dependencies {
18-
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
18+
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
1919
}
2020
}
2121

‎build.properties‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
mod_version=2.0.1
2-
minecraft_version=1.9
3-
forge_version=12.16.1.1905
4-
mappings=snapshot_20160312
1+
mod_version=2.0.2
2+
minecraft_version=1.9.4
3+
forge_version=12.17.0.1976
4+
mappings=snapshot_20160518
55

6-
mantle_version=0.9.+
7-
tinkers_version=2.2.+
8-
jei_version=3.3.+
9-
waila_version=1.7.0-B2_1.9
6+
mantle_version=0.10.+
7+
tinkers_version=2.3.+
8+
jei_version=3.6.+
9+
waila_version=1.7.0-B3_1.9.4
1010

‎src/main/java/com/renevo/nethercore/NetherCore.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
@Mod(
1515
modid = Util.MODID,
16-
dependencies = "required-after:Forge@[12.16.1,);required-after:mantle@[1.9-0.9,)",
17-
acceptedMinecraftVersions = "1.9",
16+
dependencies = "required-after:Forge@[12.17,);required-after:mantle@[1.9.4-0.10,)",
17+
acceptedMinecraftVersions = "1.9.4",
1818
updateJSON = "https://raw.githubusercontent.com/RenEvo/nethercore/master/update.json",
1919
useMetadata = true,
2020
guiFactory="com.renevo.nethercore.client.gui.config.ModGuiFactory")

‎src/main/java/com/renevo/nethercore/NetherCoreAchievements.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,22 @@ private NetherCoreAchievements() {
2828

2929
public static void init() {
3030

31-
netherSporeAchievement = new Achievement("achievement.netherspore", "netherspore", 0, 12, NetherCoreItems.netherSpore, AchievementList.blazeRod);
31+
netherSporeAchievement = new Achievement("achievement.netherspore", "netherspore", 0, 12, NetherCoreItems.netherSpore, AchievementList.BLAZE_ROD);
3232
netherSporeAchievement.registerStat();
3333

34-
netherStoneAchievement = new Achievement("achievement.netherstone", "netherstone", -2, 10, NetherCoreItems.stoneCobble, AchievementList.portal);
34+
netherStoneAchievement = new Achievement("achievement.netherstone", "netherstone", -2, 10, NetherCoreItems.stoneCobble, AchievementList.PORTAL);
3535
netherStoneAchievement.registerStat();
3636

3737
netherFurnaceAchievement = new Achievement("achievement.netherfurnace", "netherfurnace", -4, 10, NetherCoreBlocks.blockNetherFurnace, netherStoneAchievement);
3838
netherFurnaceAchievement.registerStat();
3939

40-
netherOreAchievement = new Achievement("achievement.netherore", "netherore", -2, 12, NetherCoreItems.netherOreIron, AchievementList.portal);
40+
netherOreAchievement = new Achievement("achievement.netherore", "netherore", -2, 12, NetherCoreItems.netherOreIron, AchievementList.PORTAL);
4141
netherOreAchievement.registerStat();
4242

4343
compressionAchievement = new Achievement("achievement.compressednether", "compressednether", -4, 12, NetherCoreBlocks.blockCompressedNetherrack, netherOreAchievement);
4444
compressionAchievement.registerStat();
4545

46-
xbAchievement = new Achievement("achievement.xbcrafted", "xbcrafted", -6, 12, Items.nether_star, compressionAchievement);
46+
xbAchievement = new Achievement("achievement.xbcrafted", "xbcrafted", -6, 12, Items.NETHER_STAR, compressionAchievement);
4747
xbAchievement.registerStat().setSpecial();
4848

4949
MinecraftForge.EVENT_BUS.register(new NetherCoreAchievements());
@@ -82,7 +82,7 @@ public void onCraftItem(PlayerEvent.ItemCraftedEvent event) {
8282

8383
@SubscribeEvent
8484
public void onSmeltItem(PlayerEvent.ItemSmeltedEvent event) {
85-
if (event.smelting.getItem() == Items.nether_star) {
85+
if (event.smelting.getItem() == Items.NETHER_STAR) {
8686
event.player.addStat(xbAchievement, 1);
8787
return;
8888
}

‎src/main/java/com/renevo/nethercore/NetherCoreRegistry.java‎

Lines changed: 51 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,28 @@ public final class NetherCoreRegistry {
1818
private NetherCoreRegistry() {
1919
}
2020

21-
public static CreativeTab tabNetherCore = new CreativeTab("NetherCore", new ItemStack(Blocks.netherrack));
21+
public static CreativeTab tabNetherCore = new CreativeTab("NetherCore", new ItemStack(Blocks.NETHERRACK));
2222

2323
public static void registerSmelting() {
24-
GameRegistry.addSmelting(NetherCoreItems.netherOreCoal.copy(), new ItemStack(Items.coal, 2), 0.0f);
25-
GameRegistry.addSmelting(NetherCoreItems.netherOreIron.copy(), new ItemStack(Blocks.iron_ore, 2), 0.2f);
26-
GameRegistry.addSmelting(NetherCoreItems.netherOreGold.copy(), new ItemStack(Blocks.gold_ore, 2), 0.2f);
27-
GameRegistry.addSmelting(NetherCoreItems.netherOreRedstone.copy(), new ItemStack(Items.redstone, 2), 0.2f);
28-
GameRegistry.addSmelting(NetherCoreItems.netherOreLapis.copy(), new ItemStack(Items.dye, 2, EnumDyeColor.BLUE.getDyeDamage()), 0.2f);
29-
GameRegistry.addSmelting(NetherCoreItems.netherOreDiamond.copy(), new ItemStack(Items.diamond, 2), 0.2f);
30-
GameRegistry.addSmelting(NetherCoreItems.netherOreEmerald.copy(), new ItemStack(Items.emerald, 2), 0.2f);
24+
GameRegistry.addSmelting(NetherCoreItems.netherOreCoal.copy(), new ItemStack(Items.COAL, 2), 0.0f);
25+
GameRegistry.addSmelting(NetherCoreItems.netherOreIron.copy(), new ItemStack(Blocks.IRON_ORE, 2), 0.2f);
26+
GameRegistry.addSmelting(NetherCoreItems.netherOreGold.copy(), new ItemStack(Blocks.GOLD_ORE, 2), 0.2f);
27+
GameRegistry.addSmelting(NetherCoreItems.netherOreRedstone.copy(), new ItemStack(Items.REDSTONE, 2), 0.2f);
28+
GameRegistry.addSmelting(NetherCoreItems.netherOreLapis.copy(), new ItemStack(Items.DYE, 2, EnumDyeColor.BLUE.getDyeDamage()), 0.2f);
29+
GameRegistry.addSmelting(NetherCoreItems.netherOreDiamond.copy(), new ItemStack(Items.DIAMOND, 2), 0.2f);
30+
GameRegistry.addSmelting(NetherCoreItems.netherOreEmerald.copy(), new ItemStack(Items.EMERALD, 2), 0.2f);
3131

3232
GameRegistry.addSmelting(NetherCoreItems.stoneCobble, NetherCoreItems.stone, 0.2F);
3333
GameRegistry.addSmelting(NetherCoreItems.stoneBrick, NetherCoreItems.stoneBrickCracked, 0.0F);
3434

3535
// collides with Soul Shards - The old way, need to adjust if present
36+
// TODO: Alternate recipe - not sure
3637
if (Config.enableSoulGlassRecipe) {
37-
GameRegistry.addSmelting(Blocks.soul_sand, NetherCoreItems.soulGlass, 0.0F);
38+
GameRegistry.addSmelting(Blocks.SOUL_SAND, NetherCoreItems.soulGlass, 0.0F);
3839
}
3940

4041
if (Config.enableSmeltedNetherStar) {
41-
GameRegistry.addSmelting(NetherCoreItems.compressedNetherrackOctuple, new ItemStack(Items.nether_star, 1), 10.0f);
42+
GameRegistry.addSmelting(NetherCoreItems.compressedNetherrackOctuple, new ItemStack(Items.NETHER_STAR, 1), 10.0f);
4243
}
4344
}
4445

@@ -51,47 +52,65 @@ public static void registerOreDictionary() {
5152
OreDictionary.registerOre("oreNetherDiamond", NetherCoreItems.netherOreDiamond.copy());
5253
OreDictionary.registerOre("oreNetherEmerald", NetherCoreItems.netherOreEmerald.copy());
5354
OreDictionary.registerOre("oreNetherNetherCoal", NetherCoreItems.netherOreNetherCoal.copy());
55+
56+
OreDictionary.registerOre("cobblestone", NetherCoreItems.stoneCobble.copy());
5457
}
5558

5659
public static void registerFuels() {
5760
GameRegistry.registerFuelHandler(new FuelHandler());
5861
}
5962

6063
public static void registerRecipes() {
61-
GameRegistry.addRecipe(NetherCoreItems.stoneCobble,
64+
ItemStack result;
65+
66+
result = NetherCoreItems.stoneCobble.copy();
67+
result.stackSize = 1;
68+
GameRegistry.addRecipe(result,
6269
"##",
6370
"##",
64-
'#', Blocks.netherrack);
71+
'#', Blocks.NETHERRACK);
6572

66-
GameRegistry.addRecipe(NetherCoreItems.stoneBrick,
73+
result = NetherCoreItems.stoneBrick.copy();
74+
result.stackSize = 4;
75+
GameRegistry.addRecipe(result,
6776
"##",
6877
"##",
6978
'#', NetherCoreItems.stone);
7079

71-
GameRegistry.addRecipe(NetherCoreItems.stoneRoad,
80+
result = NetherCoreItems.stoneRoad.copy();
81+
result.stackSize = 4;
82+
GameRegistry.addRecipe(result,
7283
"##",
7384
"##",
7485
'#', NetherCoreItems.stoneBrick);
7586

76-
GameRegistry.addRecipe(NetherCoreItems.stoneCreeper,
87+
result = NetherCoreItems.stoneCreeper.copy();
88+
result.stackSize = 1;
89+
GameRegistry.addRecipe(result,
7790
"#",
7891
"G",
7992
'#', NetherCoreItems.stonePaver,
80-
'G', Items.gunpowder);
93+
'G', Items.GUNPOWDER);
8194

82-
GameRegistry.addRecipe(NetherCoreItems.stoneBrickSquare,
95+
result = NetherCoreItems.stoneBrickSquare.copy();
96+
result.stackSize = 8;
97+
GameRegistry.addRecipe(result,
8398
"###",
8499
"# #",
85100
"###",
86101
'#', NetherCoreItems.stoneBrick);
87102

88-
GameRegistry.addRecipe(NetherCoreItems.stoneBrickFancy,
103+
result = NetherCoreItems.stoneBrickFancy.copy();
104+
result.stackSize = 5;
105+
GameRegistry.addRecipe(result,
89106
"## ",
90107
" # ",
91108
" ##",
92109
'#', NetherCoreItems.stoneBrick);
93110

94-
GameRegistry.addRecipe(NetherCoreItems.stonePaver,
111+
result = NetherCoreItems.stonePaver.copy();
112+
result.stackSize = 7;
113+
GameRegistry.addRecipe(result,
95114
"###",
96115
" # ",
97116
"###",
@@ -102,11 +121,11 @@ public static void registerRecipes() {
102121
"MGM",
103122
"WSW",
104123
"BGB",
105-
'M', Items.magma_cream,
106-
'G', Items.ghast_tear,
107-
'S', Items.wheat_seeds,
108-
'B', Items.blaze_powder,
109-
'W', Items.nether_wart);
124+
'M', Items.MAGMA_CREAM,
125+
'G', Items.GHAST_TEAR,
126+
'S', Items.WHEAT_SEEDS,
127+
'B', Items.BLAZE_POWDER,
128+
'W', Items.NETHER_WART);
110129
}
111130

112131
if (Config.enableNetherFurnaceRecipe) {
@@ -115,21 +134,21 @@ public static void registerRecipes() {
115134
"CMC",
116135
"CCC",
117136
'C', NetherCoreItems.stoneCobble,
118-
'M', Items.magma_cream);
137+
'M', Items.MAGMA_CREAM);
119138
}
120139

121-
ItemStack netherRods = NetherCoreItems.netherRod.copy();
122-
netherRods.stackSize = 4;
123-
GameRegistry.addRecipe(netherRods,
140+
result = NetherCoreItems.netherRod.copy();
141+
result.stackSize = 4;
142+
GameRegistry.addRecipe(result,
124143
"R",
125144
"B",
126-
'R', Items.blaze_rod,
127-
'B', Blocks.nether_brick);
145+
'R', Items.BLAZE_ROD,
146+
'B', Blocks.NETHER_BRICK);
128147

129148
addCompressedRecipe(new ItemStack(NetherCoreItems.netherCoal), NetherCoreItems.netherCoalBlock);
130149

131150
if (Config.enableCompressedNetherrackRecipes) {
132-
addCompressedRecipe(new ItemStack(Blocks.netherrack), NetherCoreItems.compressedNetherrackSingle);
151+
addCompressedRecipe(new ItemStack(Blocks.NETHERRACK), NetherCoreItems.compressedNetherrackSingle);
133152
addCompressedRecipe(NetherCoreItems.compressedNetherrackSingle, NetherCoreItems.compressedNetherrackDouble);
134153
addCompressedRecipe(NetherCoreItems.compressedNetherrackDouble, NetherCoreItems.compressedNetherrackTriple);
135154
addCompressedRecipe(NetherCoreItems.compressedNetherrackTriple, NetherCoreItems.compressedNetherrackQuadruple);
@@ -150,7 +169,7 @@ public static void registerRecipes() {
150169

151170
addWallRecipe(NetherCoreItems.stone, NetherCoreItems.wallStone, false);
152171
addWallRecipe(NetherCoreItems.stoneCobble, NetherCoreItems.wallStoneCobble, false);
153-
addWallRecipe(new ItemStack(Blocks.nether_brick), NetherCoreItems.wallNetherBrick, true);
172+
addWallRecipe(new ItemStack(Blocks.NETHER_BRICK), NetherCoreItems.wallNetherBrick, true);
154173
}
155174

156175
public static void registerIntegrations() {

‎src/main/java/com/renevo/nethercore/blocks/BlockCompressedNetherrack.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ public class BlockCompressedNetherrack extends EnumBlock<BlockCompressedNetherra
1919
public static final PropertyEnum<CompressionDepth> TYPE = PropertyEnum.create("type", CompressionDepth.class);
2020

2121
public BlockCompressedNetherrack() {
22-
this(Material.rock);
22+
this(Material.ROCK);
2323
}
2424

2525
public BlockCompressedNetherrack(Material material) {
2626
super(material, TYPE, CompressionDepth.class);
2727

2828
setHardness(2.0f);
2929
setResistance(5.0F);
30-
setStepSound(NetherCoreBlocks.soundTypeNetherStone);
30+
setSoundType(NetherCoreBlocks.soundTypeNetherStone);
3131
setHarvestLevel("pickaxe", 1); // 1 is stone required (0 wood, 1 stone, 2 iron)
3232
setCreativeTab(NetherCoreRegistry.tabNetherCore);
3333
}

‎src/main/java/com/renevo/nethercore/blocks/BlockLightRod.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ public class BlockLightRod extends BlockDirectional {
2626
protected static final AxisAlignedBB BB_AXIS_Z = new AxisAlignedBB(0.375D, 0.375D, 0.0D, 0.625D, 0.625D, 1.0D);
2727
protected static final AxisAlignedBB BB_AXIS_X = new AxisAlignedBB(0.0D, 0.375D, 0.375D, 1.0D, 0.625D, 0.625D);
2828

29-
private MapColor mapColor = MapColor.sandColor;
29+
private MapColor mapColor = MapColor.SAND;
3030

3131
public BlockLightRod() {
32-
super(Material.circuits);
32+
super(Material.CIRCUITS);
3333
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.UP));
3434
this.setCreativeTab(NetherCoreRegistry.tabNetherCore);
3535
this.setHardness(0.3F);
@@ -38,7 +38,7 @@ public BlockLightRod() {
3838

3939
@SuppressWarnings("unused")
4040
public BlockLightRod(MapColor color) {
41-
super(Material.circuits);
41+
super(Material.CIRCUITS);
4242
mapColor = color;
4343
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.UP));
4444
this.setCreativeTab(NetherCoreRegistry.tabNetherCore);
@@ -108,10 +108,6 @@ public IBlockState onBlockPlaced(World world, BlockPos blockPos, EnumFacing faci
108108
public void onBlockAdded(World world, BlockPos blockPos, IBlockState state) {
109109
}
110110

111-
@Override
112-
public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock) {
113-
}
114-
115111
@Override
116112
public IBlockState getStateFromMeta(int meta) {
117113
IBlockState state = this.getDefaultState();

‎src/main/java/com/renevo/nethercore/blocks/BlockNetherFurnace.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ public class BlockNetherFurnace extends BlockContainer {
3333
private static boolean keepInventory;
3434

3535
protected BlockNetherFurnace(boolean isBurning) {
36-
super(Material.rock);
36+
super(Material.ROCK);
3737
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH));
3838
this.setHardness(3.5F);
39-
this.setStepSound(NetherCoreBlocks.soundTypeNetherStone);
39+
this.setSoundType(NetherCoreBlocks.soundTypeNetherStone);
4040
this.isBurning = isBurning;
4141

4242
if (!this.isBurning) {
4343
this.setCreativeTab(NetherCoreRegistry.tabNetherCore);
4444
} else {
45-
this.setCreativeTab(null);
45+
//this.setCreativeTab(null);
4646
}
4747

4848
if (this.isBurning) {

‎src/main/java/com/renevo/nethercore/blocks/BlockNetherGrass.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ public class BlockNetherGrass extends Block {
2222
public static final PropertyBool BURNING = PropertyBool.create("burning");
2323

2424
public BlockNetherGrass() {
25-
super(Material.rock);
25+
super(Material.ROCK);
2626

2727
this.setTickRandomly(true);
2828

2929
this.setHarvestLevel("pickaxe", 1); // 1 is stone required (0 wood, 1 stone, 2 iron)
30-
this.setHardness(Blocks.netherrack.getBlockHardness(null, null, null));
31-
this.setResistance(Blocks.netherrack.getExplosionResistance(null));
30+
this.setHardness(Blocks.NETHERRACK.getBlockHardness(null, null, null));
31+
this.setResistance(Blocks.NETHERRACK.getExplosionResistance(null));
3232

3333
this.setDefaultState(this.blockState.getBaseState().withProperty(BURNING, false));
34-
this.setStepSound(NetherCoreBlocks.soundTypeNetherStone);
34+
this.setSoundType(NetherCoreBlocks.soundTypeNetherStone);
3535
this.setCreativeTab(NetherCoreRegistry.tabNetherCore);
3636
}
3737

@@ -42,7 +42,7 @@ public void updateTick(World world, BlockPos blockPos, IBlockState blockState, R
4242
int rate = blockState.getValue(BURNING) ? 12 : 4;
4343
IBlockState blockUp = world.getBlockState(blockPos.up());
4444
if (blockUp.isOpaqueCube()) {
45-
world.setBlockState(blockPos, Blocks.netherrack.getDefaultState());
45+
world.setBlockState(blockPos, Blocks.NETHERRACK.getDefaultState());
4646
return;
4747
}
4848

@@ -55,17 +55,17 @@ public void updateTick(World world, BlockPos blockPos, IBlockState blockState, R
5555

5656
IBlockState iblockstate = world.getBlockState(blockpos);
5757

58-
if (iblockstate.getBlock() == Blocks.netherrack) {
58+
if (iblockstate.getBlock() == Blocks.NETHERRACK) {
5959
world.setBlockState(blockpos, NetherCoreBlocks.blockNetherGrass.getDefaultState());
60-
if (blockOnTop.getMaterial() == Material.air) {
61-
world.setBlockState(blockpos.up(), Blocks.fire.getDefaultState());
60+
if (blockOnTop.getMaterial() == Material.AIR) {
61+
world.setBlockState(blockpos.up(), Blocks.FIRE.getDefaultState());
6262
}
6363
}
6464

6565
if (iblockstate.getBlock() == NetherCoreBlocks.blockNetherOre && iblockstate.getBlock().getMetaFromState(iblockstate) == BlockNetherOre.OreTypes.COAL.getMeta()) {
6666
world.setBlockState(blockpos, NetherCoreBlocks.blockNetherOre.getDefaultState().withProperty(BlockNetherOre.TYPE, BlockNetherOre.OreTypes.NETHERCOAL));
67-
if (blockOnTop.getMaterial() == Material.air) {
68-
world.setBlockState(blockpos.up(), Blocks.fire.getDefaultState());
67+
if (blockOnTop.getMaterial() == Material.AIR) {
68+
world.setBlockState(blockpos.up(), Blocks.FIRE.getDefaultState());
6969
}
7070
}
7171
}
@@ -76,12 +76,12 @@ public void updateTick(World world, BlockPos blockPos, IBlockState blockState, R
7676
@Override
7777
public IBlockState getActualState(IBlockState blockState, IBlockAccess blockAccess, BlockPos blockPos) {
7878
Block block = blockAccess.getBlockState(blockPos.up()).getBlock();
79-
return blockState.withProperty(BURNING, block == Blocks.fire || block == Blocks.lava || block == Blocks.flowing_lava);
79+
return blockState.withProperty(BURNING, block == Blocks.FIRE || block == Blocks.LAVA || block == Blocks.FLOWING_LAVA);
8080
}
8181

8282
@Override
8383
public Item getItemDropped(IBlockState blockState, Random random, int meta) {
84-
return Blocks.netherrack.getItemDropped(Blocks.netherrack.getDefaultState(), random, meta);
84+
return Blocks.NETHERRACK.getItemDropped(Blocks.NETHERRACK.getDefaultState(), random, meta);
8585
}
8686

8787
@Override
@@ -94,6 +94,7 @@ public boolean canCreatureSpawn(IBlockState blockState, IBlockAccess blockAccess
9494
public BlockRenderLayer getBlockLayer() {
9595
return BlockRenderLayer.CUTOUT_MIPPED;
9696
}
97+
9798
@Override
9899
public int getMetaFromState(IBlockState blockState) {
99100
return 0;

0 commit comments

Comments
 (0)