Move blocks and models to their own subpackage. (#1572)

* Move blocks and models to their own submodule. * Rename submodules to minecraft. * Fix merge & move new blocks into subprojects. * Fix merge & move new blocks into subpackages.
chunky-dev · Sep 23, 2023 · 781df2a · 781df2a
1 parent 7be7fd6
commit 781df2a
Show file tree

Hide file tree

Showing 392 changed files with 6,531 additions and 2,640 deletions.
diff --git a/chunky/src/java/se/llbit/chunky/block/Air.java b/chunky/src/java/se/llbit/chunky/block/Air.java
diff --git a/chunky/src/java/se/llbit/chunky/block/Anvil.java b/chunky/src/java/se/llbit/chunky/block/Anvil.java
diff --git a/chunky/src/java/se/llbit/chunky/block/AttachedStem.java b/chunky/src/java/se/llbit/chunky/block/AttachedStem.java
diff --git a/chunky/src/java/se/llbit/chunky/block/Azalea.java b/chunky/src/java/se/llbit/chunky/block/Azalea.java
diff --git a/chunky/src/java/se/llbit/chunky/block/Bamboo.java b/chunky/src/java/se/llbit/chunky/block/Bamboo.java
diff --git a/chunky/src/java/se/llbit/chunky/block/Barrel.java b/chunky/src/java/se/llbit/chunky/block/Barrel.java
diff --git a/chunky/src/java/se/llbit/chunky/block/Beacon.java b/chunky/src/java/se/llbit/chunky/block/Beacon.java
diff --git a/chunky/src/java/se/llbit/chunky/block/Bed.java b/chunky/src/java/se/llbit/chunky/block/Bed.java
diff --git a/chunky/src/java/se/llbit/chunky/block/Beetroots.java b/chunky/src/java/se/llbit/chunky/block/Beetroots.java
diff --git a/chunky/src/java/se/llbit/chunky/block/Bell.java b/chunky/src/java/se/llbit/chunky/block/Bell.java
diff --git a/chunky/src/java/se/llbit/chunky/block/BigDripleaf.java b/chunky/src/java/se/llbit/chunky/block/BigDripleaf.java
diff --git a/chunky/src/java/se/llbit/chunky/block/BigDripleafStem.java b/chunky/src/java/se/llbit/chunky/block/BigDripleafStem.java
diff --git a/chunky/src/java/se/llbit/chunky/block/BlastFurnace.java b/chunky/src/java/se/llbit/chunky/block/BlastFurnace.java
diff --git a/chunky/src/java/se/llbit/chunky/block/BlockSpec.java b/chunky/src/java/se/llbit/chunky/block/BlockSpec.java
@@ -5,6 +5,8 @@
 import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
+
+import se.llbit.chunky.block.minecraft.UnknownBlock;
 import se.llbit.nbt.CompoundTag;
 import se.llbit.nbt.Tag;
 import se.llbit.util.NbtUtil;

diff --git a/chunky/src/java/se/llbit/chunky/block/BrewingStand.java b/chunky/src/java/se/llbit/chunky/block/BrewingStand.java
diff --git a/chunky/src/java/se/llbit/chunky/block/Button.java b/chunky/src/java/se/llbit/chunky/block/Button.java