-
Notifications
You must be signed in to change notification settings - Fork 60
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Simplify pocket schematic generation logic - Make pocket generator work without having to start Minecraft - Add `gradlew generatePocketSchematics` task - Fix travis double-build
- Loading branch information
Showing
42 changed files
with
204 additions
and
122 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,3 +28,4 @@ libs | |
| forge-*-changelog.txt | ||
| .DS_Store | ||
| Thumbs.db | ||
| logs | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| #Sat Dec 16 20:23:21 EST 2017 | ||
| #Tue Dec 19 19:32:34 EST 2017 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 0 additions & 92 deletions
92
src/main/java/com/zixiken/dimdoors/shared/util/DefaultSchematicGenerator.java
This file was deleted.
Oops, something went wrong.
166 changes: 166 additions & 0 deletions
166
src/main/java/com/zixiken/dimdoors/shared/util/PocketSchematicGenerator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| package com.zixiken.dimdoors.shared.util; | ||
|
|
||
| import com.zixiken.dimdoors.DimDoors; | ||
| import com.zixiken.dimdoors.server.DDProxyServer; | ||
| import com.zixiken.dimdoors.shared.blocks.BlockFabric; | ||
| import com.zixiken.dimdoors.shared.blocks.ModBlocks; | ||
| import com.zixiken.dimdoors.shared.rifts.RiftDestination; | ||
| import com.zixiken.dimdoors.shared.rifts.TileEntityRift; | ||
| import com.zixiken.dimdoors.shared.rifts.WeightedRiftDestination; | ||
| import net.minecraft.block.Block; | ||
| import net.minecraft.block.BlockDoor; | ||
| import net.minecraft.block.state.IBlockState; | ||
| import net.minecraft.init.Blocks; | ||
| import net.minecraft.init.Bootstrap; | ||
| import net.minecraft.nbt.CompressedStreamTools; | ||
| import net.minecraft.nbt.NBTTagCompound; | ||
| import net.minecraftforge.event.RegistryEvent; | ||
| import net.minecraftforge.fml.common.DummyModContainer; | ||
| import net.minecraftforge.fml.common.Loader; | ||
| import net.minecraftforge.fml.common.ModContainer; | ||
| import net.minecraftforge.fml.common.ModMetadata; | ||
| import net.minecraftforge.registries.GameData; | ||
| import net.minecraftforge.registries.RegistryManager; | ||
|
|
||
| import java.io.DataOutputStream; | ||
| import java.io.File; | ||
| import java.io.FileOutputStream; | ||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * | ||
| * @author Robijnvogel | ||
| */ | ||
| public class PocketSchematicGenerator { | ||
|
|
||
| // Run "gradlew generatePocketSchematics" to generate the pocket schematics | ||
| @SuppressWarnings("UseOfSystemOutOrSystemErr") | ||
| public static void main(String... args) throws IOException, NoSuchMethodException, NoSuchFieldException, IllegalAccessException { | ||
| // Register blocks and tile entities to be able to run this without starting Minecraft | ||
| Bootstrap.register(); | ||
| ModMetadata md = new ModMetadata(); | ||
| md.modId = DimDoors.MODID; | ||
| ModContainer mc = new DummyModContainer(md); | ||
| Loader.instance().setupTestHarness(mc); | ||
| Loader.instance().setActiveModContainer(mc); | ||
| ModBlocks.registerBlocks(new RegistryEvent.Register(GameData.BLOCKS, RegistryManager.ACTIVE.getRegistry(GameData.BLOCKS))); | ||
| new DDProxyServer().registerTileEntities(); | ||
| Loader.instance().setActiveModContainer(null); | ||
|
|
||
| // Parse arguments | ||
| File schematicDir; | ||
| if (args.length > 1) { | ||
| System.err.println("Too many arguments!"); | ||
| return; | ||
| } else if (args.length == 1) { | ||
| schematicDir = new File(args[0]); | ||
| if (!schematicDir.isDirectory()) { | ||
| System.err.print("The directory " + args[0] + " couldn't be found!"); | ||
| return; | ||
| } | ||
| } else { | ||
| schematicDir = new File("schematics/"); | ||
| } | ||
|
|
||
| // Generate the schematics | ||
| List<Schematic> schematics = generatePocketSchematics(8); | ||
|
|
||
| // Save the schematics | ||
| boolean isPublic = true; | ||
| for (Schematic schematic : schematics) { | ||
| NBTTagCompound schematicNBT = Schematic.saveToNBT(schematic); | ||
| File saveFile = new File(schematicDir, (isPublic ? "public/" : "private/") + schematic.schematicName + ".schem"); | ||
| saveFile.getParentFile().mkdirs(); | ||
| DataOutputStream schematicDataStream = new DataOutputStream(new FileOutputStream(saveFile)); | ||
| CompressedStreamTools.writeCompressed(schematicNBT, schematicDataStream); | ||
| schematicDataStream.flush(); | ||
| schematicDataStream.close(); | ||
| isPublic = !isPublic; | ||
| } | ||
| // TODO: also generate JSON files | ||
| } | ||
|
|
||
| public static List<Schematic> generatePocketSchematics(int maxPocketSize) { | ||
| List<Schematic> schematics = new ArrayList<>(); | ||
| for (int pocketSize = 0; pocketSize < maxPocketSize; pocketSize++) { | ||
| schematics.add(generatePocketSchematic( | ||
| "public_pocket", // base name | ||
| pocketSize, // size | ||
| ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ANCIENT), // outer wall | ||
| ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.REALITY), // inner wall | ||
| ModBlocks.DIMENSIONAL_DOOR, // door | ||
| RiftDestination.PocketExitDestination.builder().build())); // exit rift destination | ||
| schematics.add(generatePocketSchematic( | ||
| "private_pocket", // base name | ||
| pocketSize, // size | ||
| ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ANCIENT_ALTERED), // outer wall | ||
| ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ALTERED), // inner wall | ||
| ModBlocks.PERSONAL_DIMENSIONAL_DOOR, // door | ||
| RiftDestination.PrivatePocketExitDestination.builder().build())); // exit rift destination | ||
| } | ||
| return schematics; | ||
| } | ||
|
|
||
| private static Schematic generatePocketSchematic(String baseName, int pocketSize, IBlockState outerWallBlockState, IBlockState innerWallBlockState, Block doorBlock, RiftDestination exitDest) { | ||
| int size = (pocketSize + 1) * 16 - 1; // -1 so that the door can be centered | ||
|
|
||
| // Set schematic info | ||
| Schematic schematic = new Schematic(); | ||
| schematic.version = 1; | ||
| schematic.author = "Robijnvogel"; //@todo set in build.gradle ${modID} | ||
| schematic.schematicName = baseName + "_" + pocketSize; | ||
| schematic.creationDate = System.currentTimeMillis(); | ||
| schematic.requiredMods = new String[1]; | ||
| schematic.requiredMods[0] = DimDoors.MODID; | ||
| schematic.width = (short) size; | ||
| schematic.height = (short) size; | ||
| schematic.length = (short) size; | ||
| schematic.offset = new int[]{0, 0, 0}; // TODO: center pockets | ||
|
|
||
| // Generate the pallette | ||
| schematic.paletteMax = 4; | ||
| schematic.pallette = new ArrayList<>(); | ||
| schematic.pallette.add(Blocks.AIR.getDefaultState()); | ||
| schematic.pallette.add(outerWallBlockState); | ||
| schematic.pallette.add(innerWallBlockState); | ||
| schematic.pallette.add(doorBlock.getDefaultState().withProperty(BlockDoor.HALF, BlockDoor.EnumDoorHalf.LOWER)); //bottom | ||
| schematic.pallette.add(doorBlock.getDefaultState().withProperty(BlockDoor.HALF, BlockDoor.EnumDoorHalf.UPPER)); //top | ||
|
|
||
| // Set block data | ||
| schematic.blockData = new int[size][size][size]; //[x][y][z] | ||
| for (int x = 0; x < size; x++) { | ||
| for (int y = 0; y < size; y++) { | ||
| for (int z = 0; z < size; z++) { | ||
| int layer = Collections.min(Arrays.asList(x, y, z, size - x, size - y, size - z)); | ||
| if (layer == 0) { | ||
| schematic.blockData[x][y][z] = 1; // outer wall | ||
| } else if (layer < 5) { | ||
| schematic.blockData[x][y][z] = 2; // inner wall | ||
| } else { | ||
| schematic.blockData[x][y][z] = 0; // air | ||
| } | ||
| } | ||
| } | ||
| } | ||
| schematic.blockData[(size - 1)/2][5][4] = 3; // door bottom | ||
| schematic.blockData[(size - 1)/2][6][4] = 4; // door top | ||
|
|
||
| // Generate the rift TileEntities | ||
| schematic.tileEntities = new ArrayList<>(); | ||
| TileEntityRift rift = (TileEntityRift) doorBlock.createTileEntity(null, doorBlock.getDefaultState()); | ||
| rift.setSingleDestination(RiftDestination.PocketEntranceDestination.builder() | ||
| .ifDestinations(MathUtils.listFrom(new WeightedRiftDestination(exitDest, 1, 0))) | ||
| .build()); | ||
| NBTTagCompound tileNBT = rift.serializeNBT(); | ||
| tileNBT.setInteger("x", (size - 1) / 2); | ||
| tileNBT.setInteger("y", 5); | ||
| tileNBT.setInteger("z", 4); | ||
| schematic.tileEntities.add(tileNBT); | ||
|
|
||
| return schematic; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.