A few fixes

This commit is contained in:
Runemoro 2017-12-07 00:10:30 -05:00
parent b5198f2d7a
commit 38087b1571
22 changed files with 7 additions and 5 deletions

View file

@ -17,7 +17,7 @@ deploy:
provider: releases
api_key:
secure: A26twoR4XbarXTCxNIlKr4zbDRw6B+u879+6BWEKmavgAnjhGkPb9PkmR3tPm7iQDp9K9dlkez5KGUJEX/tCMYqL2gQnjlt9BfcVu7YJ4SXhZ6Zcck1/+1jhDox8QHLT2zvgYhmmEWdDD78FHJfO+2+ejhdxDMt6xxVtn47426rs0d0I1L9KDlC8EVoe42c+142Dedk5IaI2GCU07nOKaZFtAnR0NIk/Cf5P7rtecd+jNR3kaAu24U/WPoUMH2cCCf1+ViK/oJgu4FgdEGp1kec0gZnwWqJ+bYvywGiohmbN9B0JsjrwVixYgmzEw00cvdcV8uZHY/RXfOVtDh3ex9xaQYu6Fiq7L8pnw/pN6wsr7kFE0HvhSDAILIAOHFt5jlocAUfjEV/wFQyZUhxZx6Qclx7rdwYt4+iwtB+DPXR71JaaeSLtuQ7Q6HbFxrnjo1biS2ERkdOJobNBHEZvH2A9O1+bx4q9z1+LAP/XXxK2+KpzVZzkDXVUMl81oyAycuipXZQVTyDQdp9XB+waj7xclL57Cibs/DfwOw9l8DKR981h2Q784jBVlJyv/s+vZDgouxLqeTJdsK2cKOuYKl/fMhio6FIJs7p8U7l2OiXbvAg5jY1sJj69ePn7hTiMn2QHVihVM0t3W3/ppp7U0XKo++hB2VXwT/fSS8E5aXs=
file: "$HOME/build/libs/dimdoors-1.12.2-3.0.0-a4.jar"
file: "$HOME/build/DimensionalDevelopment/DimDoors/build/libs/dimdoors-1.12.2-3.0.0-a4.jar"
on:
repo: DimensionalDevelopment/DimDoors
branch: 1.12-WIP

View file

@ -8,6 +8,7 @@ import com.zixiken.dimdoors.shared.PocketRegistry;
import com.zixiken.dimdoors.shared.items.ModItems;
import com.zixiken.dimdoors.shared.RiftRegistry;
import com.zixiken.dimdoors.shared.SchematicHandler;
import com.zixiken.dimdoors.shared.util.DefaultSchematicGenerator;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -60,6 +61,8 @@ public class DimDoors {
registerCommands(event);
RiftRegistry.INSTANCE.reset();
PocketRegistry.INSTANCE.reset();
//DefaultSchematicGenerator.tempGenerateDefaultSchematics();
}
private void registerCommands(FMLServerStartingEvent event) {

View file

@ -5,6 +5,7 @@
*/
package com.zixiken.dimdoors.shared;
import com.zixiken.dimdoors.shared.util.DefaultSchematicGenerator;
import com.zixiken.dimdoors.shared.util.MathUtils;
import com.zixiken.dimdoors.shared.util.RandomUtils;
import com.zixiken.dimdoors.shared.util.Schematic;
@ -77,12 +78,9 @@ public class SchematicHandler {
DimDoors.warn("Error reading file " + file.toURI() + ". The following exception occured: ");
}
}
DimDoors.log("Loaded " + templates.size() + " templates.");
constructNameMap();
// Schematic.tempGenerateDefaultSchematics();
DimDoors.log("Loaded " + templates.size() + " templates.");
}
private static List<PocketTemplate> loadTemplatesFromJson(String jsonString) {

View file

@ -74,6 +74,7 @@ public class DefaultSchematicGenerator {
}
schematic.tileEntities = new ArrayList<>();
// TODO: DimDoors.proxy.getDefWorld() prevents running this before world load
TileEntity tileEntity = doorBlock.createTileEntity(DimDoors.proxy.getDefWorld(), doorBlock.getDefaultState());
NBTTagCompound tileNBT = tileEntity.serializeNBT();
tileNBT.setInteger("x", (maxbound - 1) / 2);