Skip to content

Commit 932b4f2

Browse files
committed
Update to MC 1.9.4
1 parent 0edbe4a commit 932b4f2

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99
}
1010
dependencies {
11-
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
11+
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
1212
}
1313
}
1414

build.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
mod_version=0.1.4
2-
minecraft_version=1.9
3-
forge_version=12.16.0.1846-1.9
4-
mcp_mappings_version=snapshot_20160312
5-
cyclopscore_version=0.5.6-287
2+
minecraft_version=1.9.4
3+
forge_version=12.17.0.1909-1.9.4
4+
mcp_mappings_version=snapshot_20160519
5+
cyclopscore_version=0.6.0-330
66
release_type=release

src/main/java/org/cyclops/structuredcrafting/Reference.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ public final class Reference {
1919
// MOD ID's
2020
public static final String MOD_FORGE = "Forge";
2121
public static final String MOD_FORGE_VERSION = "@FORGE_VERSION@";
22-
public static final String MOD_FORGE_VERSION_MIN = "12.16.0.1846";
22+
public static final String MOD_FORGE_VERSION_MIN = "12.17.0.1909";
2323
public static final String MOD_CYCLOPSCORE = "cyclopscore";
2424
public static final String MOD_CYCLOPSCORE_MINVERSION = "@CYCLOPSCORE_VERSION@";
25-
public static final String MOD_CYCLOPSCORE_VERSION_MIN = "0.5.6";
25+
public static final String MOD_CYCLOPSCORE_VERSION_MIN = "0.6.0";
2626

2727
// Dependencies
2828
public static final String MOD_DEPENDENCIES =

src/main/java/org/cyclops/structuredcrafting/block/BlockStructuredCrafter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ public static BlockStructuredCrafter getInstance() {
4242
* @param eConfig Config for this block.
4343
*/
4444
public BlockStructuredCrafter(ExtendedConfig eConfig) {
45-
super(eConfig, Material.ground, TileStructuredCrafter.class);
45+
super(eConfig, Material.GROUND, TileStructuredCrafter.class);
4646

4747
setHardness(2.0F);
48-
setStepSound(SoundType.STONE);
48+
setSoundType(SoundType.STONE);
4949
}
5050

5151
@Override
@@ -56,7 +56,7 @@ public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing,
5656

5757
@Override
5858
public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
59-
if(playerIn != null && heldItem != null && heldItem.getItem() == Items.stick) {
59+
if(playerIn != null && heldItem != null && heldItem.getItem() == Items.STICK) {
6060
this.rotateBlock(worldIn, pos, side);
6161
}
6262
return super.onBlockActivated(worldIn, pos, state, playerIn, hand, heldItem, side, hitX, hitY, hitZ);

src/main/java/org/cyclops/structuredcrafting/craft/WorldCraftingMatrix.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public boolean craft(boolean simulate) {
119119
// Determine output
120120
if(itemStack != null && addItemStackForOutput(world, targetPos, targetSide, outputProviders, itemStack, simulate)) {
121121
// Handle remaining container items: place blocks and drop items
122-
ItemStack[] remainingStacks = CraftingManager.getInstance().func_180303_b(INVENTORY_CRAFTING, world);
122+
ItemStack[] remainingStacks = CraftingManager.getInstance().getRemainingItems(INVENTORY_CRAFTING, world);
123123
for(int i = 0; i < remainingStacks.length; i++) {
124124
ItemStack remainingStack = remainingStacks[i];
125125
if(providers[i] != null) {

0 commit comments

Comments
 (0)