Skip to content

Commit 964e094

Browse files
rubensworksrubensworks
committed
Initial MC 1.11 update
1 parent 4e474af commit 964e094

18 files changed

Lines changed: 50 additions & 54 deletions

File tree

‎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.6
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.7.0-363
2+
minecraft_version=1.11
3+
forge_version=13.19.1.2189
4+
mcp_mappings_version=snapshot_20161206
5+
cyclopscore_version=0.8.2-434
66
release_type=release

‎src/api/java/org/cyclops/commoncapabilities/api‎

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ public final class Reference {
1717
public static final String VERSION_URL = "https://raw.githubusercontent.com/CyclopsMC/Versions/master/1.9/StructuredCrafting.txt";
1818

1919
// MOD ID's
20-
public static final String MOD_FORGE = "Forge";
20+
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.17.0.1909";
22+
public static final String MOD_FORGE_VERSION_MIN = "13.19.1.2189";
2323
public static final String MOD_CYCLOPSCORE = "cyclopscore";
2424
public static final String MOD_CYCLOPSCORE_MINVERSION = "@CYCLOPSCORE_VERSION@";
2525
public static final String MOD_CYCLOPSCORE_VERSION_MIN = "0.7.0";

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,18 @@ public BlockStructuredCrafter(ExtendedConfig eConfig) {
4949
}
5050

5151
@Override
52-
public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ,
53-
int meta, EntityLivingBase placer) {
52+
public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ,
53+
int meta, EntityLivingBase placer, EnumHand hand) {
5454
return this.getDefaultState().withProperty(FACING, facing.getOpposite());
5555
}
5656

5757
@Override
58-
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) {
58+
public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
59+
ItemStack heldItem = playerIn.getHeldItem(hand);
60+
if(playerIn != null && !heldItem.isEmpty() && heldItem.getItem() == Items.STICK) {
6061
this.rotateBlock(worldIn, pos, side);
6162
}
62-
return super.onBlockActivated(worldIn, pos, state, playerIn, hand, heldItem, side, hitX, hitY, hitZ);
63+
return super.onBlockActivated(worldIn, pos, state, playerIn, hand, side, hitX, hitY, hitZ);
6364
}
6465

6566
}

‎src/main/java/org/cyclops/structuredcrafting/block/BlockStructuredCrafterConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public BlockStructuredCrafterConfig() {
2121
super(
2222
StructuredCrafting._instance,
2323
true,
24-
"structuredCrafter",
24+
"structured_crafter",
2525
null,
2626
BlockStructuredCrafter.class
2727
);

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.google.common.collect.Lists;
44
import net.minecraft.item.ItemStack;
55
import net.minecraft.item.crafting.CraftingManager;
6+
import net.minecraft.util.NonNullList;
67
import net.minecraft.util.math.BlockPos;
78
import net.minecraft.util.EnumFacing;
89
import net.minecraft.world.World;
@@ -86,19 +87,19 @@ public boolean craft(boolean simulate) {
8687

8788
BlockPos[] positions = new BlockPos[9];
8889
IItemStackProvider[] providers = new IItemStackProvider[9];
89-
ItemStack itemStack = null;
90+
ItemStack itemStack = ItemStack.EMPTY;
9091
for(int k = 0; k < 3; k++) {
9192
// Set crafting grid
92-
if(itemStack == null) {
93+
if(itemStack.isEmpty()) {
9394
for (int i = -1; i < 2; i++) {
9495
for (int j = -1; j < 2; j++) {
9596
int arrayIndex = (j + 1) * 3 + (i + 1);
9697
BlockPos pos = addInAxis(centerPos, axis, i, j);
9798
Pair<ItemStack, IItemStackProvider> result = determineItemStackProviderForInput(world, pos, inputSide);
98-
ItemStack itemStackInput = result != null ? result.getLeft() : null;
99-
if (itemStackInput != null) {
99+
ItemStack itemStackInput = result != null ? result.getLeft() : ItemStack.EMPTY;
100+
if (!itemStackInput.isEmpty()) {
100101
itemStackInput = itemStackInput.copy();
101-
itemStackInput.stackSize = 1;
102+
itemStackInput.setCount(1);
102103
}
103104
// This makes sure we can also accept recipes which are rotated, mirroring is already supported by Vanilla.
104105
if (k == 0) {
@@ -117,14 +118,14 @@ public boolean craft(boolean simulate) {
117118
}
118119

119120
// Determine output
120-
if(itemStack != null && addItemStackForOutput(world, targetPos, targetSide, outputProviders, itemStack, simulate)) {
121+
if(!itemStack.isEmpty() && addItemStackForOutput(world, targetPos, targetSide, outputProviders, itemStack, simulate)) {
121122
// Handle remaining container items: place blocks and drop items
122-
ItemStack[] remainingStacks = CraftingManager.getInstance().getRemainingItems(INVENTORY_CRAFTING, world);
123-
for(int i = 0; i < remainingStacks.length; i++) {
124-
ItemStack remainingStack = remainingStacks[i];
123+
NonNullList<ItemStack> remainingStacks = CraftingManager.getInstance().getRemainingItems(INVENTORY_CRAFTING, world);
124+
for(int i = 0; i < remainingStacks.size(); i++) {
125+
ItemStack remainingStack = remainingStacks.get(i);
125126
if(providers[i] != null) {
126127
providers[i].reduceItemStack(world, positions[i], inputSide, simulate);
127-
if (remainingStack != null && remainingStack.stackSize > 0) {
128+
if (!remainingStack.isEmpty() && remainingStack.getCount() > 0) {
128129
providers[i].addItemStack(world, positions[i], inputSide, remainingStack, simulate);
129130
}
130131
}
@@ -135,7 +136,7 @@ public boolean craft(boolean simulate) {
135136
}
136137

137138
public static WorldCraftingMatrix deriveMatrix(World world, BlockPos centerPos) {
138-
EnumFacing side = ((EnumFacing) world.getBlockState(centerPos).getValue(BlockStructuredCrafter.FACING)).getOpposite();
139+
EnumFacing side = (world.getBlockState(centerPos).getValue(BlockStructuredCrafter.FACING)).getOpposite();
139140
return new WorldCraftingMatrix(world, centerPos.offset(side), side.getAxis(),
140141
centerPos.offset(side.getOpposite()), side.getOpposite());
141142
}

‎src/main/java/org/cyclops/structuredcrafting/craft/provider/InventoryItemStackProvider.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class InventoryItemStackProvider implements IItemStackProvider {
2020
protected Pair<Integer, ItemStack> getFirstItem(IInventory inventory, EnumFacing side) {
2121
for(int slot = 0; slot < inventory.getSizeInventory(); slot++) {
2222
ItemStack itemStack = inventory.getStackInSlot(slot);
23-
if(itemStack != null) {
23+
if(!itemStack.isEmpty()) {
2424
return Pair.of(slot, itemStack);
2525
}
2626
}
@@ -30,7 +30,7 @@ protected Pair<Integer, ItemStack> getFirstItem(IInventory inventory, EnumFacing
3030
protected Pair<Integer, ItemStack> getFirstItem(IItemHandler itemHandler, EnumFacing side) {
3131
for(int slot = 0; slot < itemHandler.getSlots(); slot++) {
3232
ItemStack itemStack = itemHandler.getStackInSlot(slot);
33-
if(itemStack != null) {
33+
if(!itemStack.isEmpty()) {
3434
return Pair.of(slot, itemStack);
3535
}
3636
}
@@ -64,17 +64,17 @@ public void reduceItemStack(World world, BlockPos pos, EnumFacing side, boolean
6464
IItemHandler itemHandler = TileHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY);
6565
if(itemHandler != null) {
6666
for(int slot = 0; slot < itemHandler.getSlots(); slot++) {
67-
if(itemHandler.extractItem(slot, 1, simulate) != null) {
67+
if(!itemHandler.extractItem(slot, 1, simulate).isEmpty()) {
6868
break;
6969
}
7070
}
7171
} else {
7272
IInventory inventory = TileHelpers.getSafeTile(world, pos, IInventory.class);
7373
Pair<Integer, ItemStack> result = getFirstItem(inventory, side);
7474
ItemStack newItemStack = result.getRight().copy();
75-
newItemStack.stackSize--;
76-
if (newItemStack.stackSize <= 0) {
77-
newItemStack = null;
75+
newItemStack.shrink(1);
76+
if (newItemStack.getCount() <= 0) {
77+
newItemStack = ItemStack.EMPTY;
7878
}
7979
if(!simulate) {
8080
inventory.setInventorySlotContents(result.getLeft(), newItemStack);
@@ -87,7 +87,7 @@ public boolean addItemStack(World world, BlockPos pos, EnumFacing side, ItemStac
8787
IItemHandler itemHandler = TileHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY);
8888
if(itemHandler != null) {
8989
for(int slot = 0; slot < itemHandler.getSlots(); slot++) {
90-
if(itemHandler.insertItem(slot, itemStack, simulate) == null) {
90+
if(itemHandler.insertItem(slot, itemStack, simulate).isEmpty()) {
9191
return true;
9292
}
9393
}
@@ -107,7 +107,7 @@ public boolean setItemStack(World world, BlockPos pos, EnumFacing side, ItemStac
107107
IItemHandler itemHandler = TileHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY);
108108
if(itemHandler != null) {
109109
for(int slot = 0; slot < itemHandler.getSlots(); slot++) {
110-
if(itemHandler.insertItem(slot, itemStack, simulate) == null) {
110+
if(itemHandler.insertItem(slot, itemStack, simulate).isEmpty()) {
111111
return true;
112112
}
113113
}

‎src/main/java/org/cyclops/structuredcrafting/craft/provider/WorldItemStackProvider.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public boolean hasItemStack(World world, BlockPos pos, EnumFacing side) {
2828
public ItemStack getItemStack(World world, BlockPos pos, EnumFacing side) {
2929
IBlockState blockState = world.getBlockState(pos);
3030

31-
ItemStack itemStack = null;
31+
ItemStack itemStack = ItemStack.EMPTY;
3232
if(blockState != null) {
3333
Item item = Item.getItemFromBlock(blockState.getBlock());
3434
if(item != null) {
@@ -54,9 +54,9 @@ public boolean addItemStack(World world, BlockPos pos, EnumFacing side, ItemStac
5454
public boolean setItemStack(World world, BlockPos pos, EnumFacing side, ItemStack itemStack, boolean simulate) {
5555
if(!simulate && itemStack.getItem() instanceof ItemBlock) {
5656
world.setBlockState(pos, ((ItemBlock) itemStack.getItem()).getBlock().getStateFromMeta(itemStack.getItemDamage()));
57-
itemStack.stackSize--;
57+
itemStack.shrink(1);
5858
}
59-
if(!simulate && itemStack.stackSize > 0) {
59+
if(!simulate && itemStack.getCount() > 0) {
6060
ItemStackHelpers.spawnItemStack(world, pos, itemStack);
6161
}
6262
return true;

‎src/main/java/org/cyclops/structuredcrafting/tileentity/TileStructuredCrafter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ public TileStructuredCrafter() {
2525

2626
public WorldCraftingMatrix getMatrix() {
2727
if(matrix == null) {
28-
matrix = WorldCraftingMatrix.deriveMatrix(worldObj, pos);
28+
matrix = WorldCraftingMatrix.deriveMatrix(world, pos);
2929
}
3030
return matrix;
3131
}
3232

3333
@Override
3434
protected void updateTileEntity() {
3535
tickOffset = (tickOffset + 1) % SPEED;
36-
if(!worldObj.isRemote && tickOffset == 0) {
37-
if(worldObj.isBlockPowered(getPos())) {
36+
if(!world.isRemote && tickOffset == 0) {
37+
if(world.isBlockPowered(getPos())) {
3838
getMatrix().craft(false);
3939
} else {
4040
matrix = null;

src/main/resources/assets/structuredcrafting/blockstates/structuredCrafter.json renamed to src/main/resources/assets/structuredcrafting/blockstates/structured_crafter.json

File renamed without changes.

0 commit comments

Comments
 (0)