Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix gateways

Browse source
This commit is contained in:
Runemoro 2017-12-10 21:12:29 -05:00
parent be520b1b41
commit c2f3c50cb2
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/zixiken/dimdoors/shared/RiftRegistry.java
View file

@ -197,7 +197,9 @@ public class RiftRegistry {
} }
void unRegisterUnpairedRiftAtDepth(int riftID) { void unRegisterUnpairedRiftAtDepth(int riftID) {
TileEntity tileEntity = rifts.get(riftID).getTileEntity(); Location rift1 = rifts.get(riftID);
if (rift1 == null) return;
TileEntity tileEntity = rift1.getTileEntity();
if (tileEntity instanceof DDTileEntityBase) { if (tileEntity instanceof DDTileEntityBase) {
DDTileEntityBase rift = (DDTileEntityBase) tileEntity; DDTileEntityBase rift = (DDTileEntityBase) tileEntity;
unRegisterUnpairedRiftAtDepth(rift); unRegisterUnpairedRiftAtDepth(rift);

14
src/main/java/com/zixiken/dimdoors/shared/util/SchematicConverter.java
View file

@ -4,6 +4,7 @@ import com.zixiken.dimdoors.DimDoors;
import com.zixiken.dimdoors.shared.blocks.ModBlocks; import com.zixiken.dimdoors.shared.blocks.ModBlocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
@ -76,7 +77,14 @@ public class SchematicConverter {
Map<Integer, Byte> palletteMap = new HashMap<>(); // block ID -> pallette index Map<Integer, Byte> palletteMap = new HashMap<>(); // block ID -> pallette index
byte currentPalletteIndex = 0; byte currentPalletteIndex = 0;
for (int i = 0; i < blockIntArray.length; i++) { for (int i = 0; i < blockIntArray.length; i++) {
int id = ((addId[i >> 1] & 0x0F) << 8) + (blockIntArray[i] & 0xFF); int id;
if (i >> 1 >= addId.length) {
id = (short) (blockIntArray[i] & 0xFF);
} else if ((i & 1) == 0) {
id = (short) (((addId[i >> 1] & 0x0F) << 8) + (blockIntArray[i] & 0xFF));
} else {
id = (short) (((addId[i >> 1] & 0xF0) << 4) + (blockIntArray[i] & 0xFF));
}
if (palletteMap.containsKey(id)) { if (palletteMap.containsKey(id)) {
blockIntArray[i] = palletteMap.get(id); blockIntArray[i] = palletteMap.get(id);
} else { } else {
@ -91,10 +99,6 @@ public class SchematicConverter {
case 1979: case 1979:
block = ModBlocks.TRANSIENT_DIMENSIONAL_DOOR; block = ModBlocks.TRANSIENT_DIMENSIONAL_DOOR;
break; break;
case 1792:
break;
case 1816:
break;
} }
//if (id != 0 && block.getRegistryName().toString().equals("minecraft:air")) throw new RuntimeException("Change conversion code!"); //if (id != 0 && block.getRegistryName().toString().equals("minecraft:air")) throw new RuntimeException("Change conversion code!");
schematic.pallette.add(block.getDefaultState()); schematic.pallette.add(block.getDefaultState());