tilera/IndustrialWires
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Mechanical multiblock examples look mostly right when used with the IP projector

Browse source
This commit is contained in:
malte0811 2018-06-08 21:08:55 +02:00
parent bf8ea992b8
commit 781ed3d773
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build.gradle
View file

@ -83,6 +83,7 @@ jar {
from 'LICENSE'
manifest {
attributes 'Maven-Artifact': group+':'+archivesBaseName+':'+version
attributes "FMLAT": "industrialwires_at.cfg"
}
}

15
src/main/java/malte0811/industrialWires/util/MultiblockTemplateManual.java
View file

@ -21,7 +21,6 @@ import malte0811.industrialWires.compat.Compat;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
@ -65,7 +64,7 @@ public class MultiblockTemplateManual implements MultiblockHandler.IMultiblock {
for (int x = 0; x < size.getX(); x++) {
for (int y = 0; y < size.getY(); y++) {
for (int z = 0; z < size.getZ(); z++) {
fakeStructure[y][x][z] = new ItemStack(Items.COMMAND_BLOCK_MINECART);
fakeStructure[y][x][z] = ItemStack.EMPTY;
}
}
}
@ -76,7 +75,8 @@ public class MultiblockTemplateManual implements MultiblockHandler.IMultiblock {
ItemStack here = Compat.stackFromInfo.apply(new ItemStack(info.blockState.getBlock(), 1,
info.blockState.getBlock().getMetaFromState(info.blockState)), info);
if (!here.isEmpty()) {
realStructure.put(fakeStructure[info.pos.getY()][info.pos.getX()][info.pos.getZ()],
fakeStructure[info.pos.getY()][info.pos.getX()][info.pos.getZ()] = here;
realStructure.put(here,
info.blockState);
Optional<ItemStack> match = matsSet.stream().filter(s -> ItemStack.areItemsEqual(here, s)).findAny();
if (match.isPresent()) {
@ -87,15 +87,6 @@ public class MultiblockTemplateManual implements MultiblockHandler.IMultiblock {
}
}
mats = matsSet.stream().map(IngredientStack::new).toArray(IngredientStack[]::new);
for (int x = 0; x < size.getX(); x++) {
for (int y = 0; y < size.getY(); y++) {
for (int z = 0; z < size.getZ(); z++) {
if (!realStructure.containsKey(fakeStructure[y][x][z])) {
fakeStructure[y][x][z] = ItemStack.EMPTY;
}
}
}
}
}
}