Remove Artiface as dependency

.gitignore

@@ -157,5 +157,31 @@ gradle-app.setting
 
 ### Gradle Patch ###
 **/build/
-
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
 # End of https://www.gitignore.io/api/java,gradle,windows,intellij,forgegradle

src/main/java/net/kyrptonaught/glassdoor/ArtificeHelper.java → ArtificeHelper.java

@@ -3,13 +3,15 @@
 import com.swordglowsblue.artifice.api.Artifice;
 import com.swordglowsblue.artifice.api.ArtificeResourcePack;
 import com.swordglowsblue.artifice.api.resource.TemplateResource;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.server.command.CommandSource;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
 import java.io.*;
+import java.nio.file.Files;
 import java.util.stream.Collectors;
 
 class ArtificeHelper {
@@ -27,6 +29,19 @@ static void generateRecipies() {
             for (String wood : woodtype)
                 pack.add(new Identifier(GlassDoorMod.MOD_ID, "loot_tables/blocks/" + wood + "_glassdoor.json"), new TemplateResource(templateFile).expand("woodtype", wood));
         });
+        File Path = new File(FabricLoader.getInstance().getGameDirectory() +"/dump");
+        try {
+            Files.createDirectories(Path.toPath());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        Artifice.DATA.iterator().forEachRemaining(pack -> {
+            try {
+                pack.dumpResources(Path.getPath());
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        });
     }
 
     private static void registerRecipe(ArtificeResourcePack.ServerResourcePackBuilder pack, String name, Block output, Block input) {
@@ -70,6 +85,19 @@ static void generateAssets() {
                 });
             }
         });
+        File Path = new File(FabricLoader.getInstance().getGameDirectory() +"/dump");
+        try {
+            Files.createDirectories(Path.toPath());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        Artifice.ASSETS.iterator().forEachRemaining(pack -> {
+            try {
+                pack.dumpResources(Path.getPath());
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        });
     }
 
     private static String readTemplateFile(String templateFile) {

build.gradle

@@ -21,10 +21,6 @@ dependencies {
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}"
 	modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
 	modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-	modCompile "io.github.prospector.modmenu:ModMenu:1.+"
-
-	modImplementation "com.github.swordglowsblue:artifice:${project.artifice_version}"
-include "com.github.swordglowsblue:artifice:${project.artifice_version}"
 }
 
 processResources {

gradle.properties

@@ -4,16 +4,14 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
 minecraft_version=1.14.3
-yarn_mappings=1.14.3+build.12
-loader_version=0.4.8+build.155
-
+yarn_mappings=1.14.3+build.13
+loader_version=0.4.8+build.157
 
 # Mod Properties
-mod_version=1.2.1
+mod_version=1.3.0
 maven_group = net.fabricmc
 archives_base_name=glassdoor
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric
-fabric_version=0.3.0+build.191
-artifice_version=0.3.3
+fabric_version=0.3.0+build.198

src/main/java/net/kyrptonaught/glassdoor/BlockGlassDoor.java

@@ -15,7 +15,6 @@
 import net.minecraft.world.World;
 
 
-
 public class BlockGlassDoor extends DoorBlock {
 
     BlockGlassDoor(Settings block$Settings_1, String name) {
@@ -27,7 +26,7 @@ public class BlockGlassDoor extends DoorBlock {
     @Override
     public boolean activate(BlockState blockState_1, World world_1, BlockPos blockPos_1, PlayerEntity playerEntity_1, Hand hand_1, BlockHitResult blockHitResult_1) {
         super.activate(blockState_1, world_1, blockPos_1, playerEntity_1, hand_1, blockHitResult_1);
-         BlockTags.WOODEN_DOORS.values().forEach(block -> System.out.println(block.toString()));
+        BlockTags.WOODEN_DOORS.values().forEach(block -> System.out.println(block.toString()));
         return true;
     }
 }

src/main/java/net/kyrptonaught/glassdoor/GlassDoorMod.java

@@ -10,11 +10,11 @@ public class GlassDoorMod implements ModInitializer, ClientModInitializer {
     @Override
     public void onInitialize() {
         ModBlocks.register();
-        ArtificeHelper.generateRecipies();
+        // ArtificeHelper.generateRecipies();
     }
 
     @Override
     public void onInitializeClient() {
-        ArtificeHelper.generateAssets();
+        //ArtificeHelper.generateAssets();
     }
 }

src/main/java/net/kyrptonaught/glassdoor/ModBlocks.java

@@ -1,7 +1,6 @@
 package net.kyrptonaught.glassdoor;
 
 import net.minecraft.block.*;
-import net.minecraft.tag.BlockTags;
 
 public class ModBlocks {
     public static BlockGlassDoor oak_glassdoor;

src/main/java/net/kyrptonaught/glassdoor/mixin/MixinDoorBlock.java

@@ -26,6 +26,7 @@ public MixinDoorBlock(Settings block$Settings_1) {
         super(block$Settings_1);
 
     }
+
     @Inject(method = "activate", at = @At("HEAD"), cancellable = true)
     public void glassdoor$activate(BlockState blockState_1, World world_1, BlockPos blockPos_1, PlayerEntity playerEntity_1, Hand hand_1, BlockHitResult blockHitResult_1, CallbackInfoReturnable<Boolean> callbackInfoReturnable) {
         ItemStack hand = playerEntity_1.inventory.getMainHandStack();

src/main/resources/assets/glassdoor/blockstates/acacia_glassdoor.json

@@ -0,0 +1,124 @@
+{
+  "variants": {
+    "facing=east,half=lower,hinge=left,open=false": {
+      "model": "glassdoor:block/acacia_door_bottom"
+    },
+    "facing=south,half=lower,hinge=left,open=false": {
+      "model": "glassdoor:block/acacia_door_bottom",
+      "y": 90
+    },
+    "facing=west,half=lower,hinge=left,open=false": {
+      "model": "glassdoor:block/acacia_door_bottom",
+      "y": 180
+    },
+    "facing=north,half=lower,hinge=left,open=false": {
+      "model": "glassdoor:block/acacia_door_bottom",
+      "y": 270
+    },
+    "facing=east,half=lower,hinge=right,open=false": {
+      "model": "glassdoor:block/acacia_door_bottom_hinge"
+    },
+    "facing=south,half=lower,hinge=right,open=false": {
+      "model": "glassdoor:block/acacia_door_bottom_hinge",
+      "y": 90
+    },
+    "facing=west,half=lower,hinge=right,open=false": {
+      "model": "glassdoor:block/acacia_door_bottom_hinge",
+      "y": 180
+    },
+    "facing=north,half=lower,hinge=right,open=false": {
+      "model": "glassdoor:block/acacia_door_bottom_hinge",
+      "y": 270
+    },
+    "facing=east,half=lower,hinge=left,open=true": {
+      "model": "glassdoor:block/acacia_door_bottom_hinge",
+      "y": 90
+    },
+    "facing=south,half=lower,hinge=left,open=true": {
+      "model": "glassdoor:block/acacia_door_bottom_hinge",
+      "y": 180
+    },
+    "facing=west,half=lower,hinge=left,open=true": {
+      "model": "glassdoor:block/acacia_door_bottom_hinge",
+      "y": 270
+    },
+    "facing=north,half=lower,hinge=left,open=true": {
+      "model": "glassdoor:block/acacia_door_bottom_hinge"
+    },
+    "facing=east,half=lower,hinge=right,open=true": {
+      "model": "glassdoor:block/acacia_door_bottom",
+      "y": 270
+    },
+    "facing=south,half=lower,hinge=right,open=true": {
+      "model": "glassdoor:block/acacia_door_bottom"
+    },
+    "facing=west,half=lower,hinge=right,open=true": {
+      "model": "glassdoor:block/acacia_door_bottom",
+      "y": 90
+    },
+    "facing=north,half=lower,hinge=right,open=true": {
+      "model": "glassdoor:block/acacia_door_bottom",
+      "y": 180
+    },
+    "facing=east,half=upper,hinge=left,open=false": {
+      "model": "glassdoor:block/acacia_door_top"
+    },
+    "facing=south,half=upper,hinge=left,open=false": {
+      "model": "glassdoor:block/acacia_door_top",
+      "y": 90
+    },
+    "facing=west,half=upper,hinge=left,open=false": {
+      "model": "glassdoor:block/acacia_door_top",
+      "y": 180
+    },
+    "facing=north,half=upper,hinge=left,open=false": {
+      "model": "glassdoor:block/acacia_door_top",
+      "y": 270
+    },
+    "facing=east,half=upper,hinge=right,open=false": {
+      "model": "glassdoor:block/acacia_door_top_hinge"
+    },
+    "facing=south,half=upper,hinge=right,open=false": {
+      "model": "glassdoor:block/acacia_door_top_hinge",
+      "y": 90
+    },
+    "facing=west,half=upper,hinge=right,open=false": {
+      "model": "glassdoor:block/acacia_door_top_hinge",
+      "y": 180
+    },
+    "facing=north,half=upper,hinge=right,open=false": {
+      "model": "glassdoor:block/acacia_door_top_hinge",
+      "y": 270
+    },
+    "facing=east,half=upper,hinge=left,open=true": {
+      "model": "glassdoor:block/acacia_door_top_hinge",
+      "y": 90
+    },
+    "facing=south,half=upper,hinge=left,open=true": {
+      "model": "glassdoor:block/acacia_door_top_hinge",
+      "y": 180
+    },
+    "facing=west,half=upper,hinge=left,open=true": {
+      "model": "glassdoor:block/acacia_door_top_hinge",
+      "y": 270
+    },
+    "facing=north,half=upper,hinge=left,open=true": {
+      "model": "glassdoor:block/acacia_door_top_hinge"
+    },
+    "facing=east,half=upper,hinge=right,open=true": {
+      "model": "glassdoor:block/acacia_door_top",
+      "y": 270
+    },
+    "facing=south,half=upper,hinge=right,open=true": {
+      "model": "glassdoor:block/acacia_door_top"
+    },
+    "facing=west,half=upper,hinge=right,open=true": {
+      "model": "glassdoor:block/acacia_door_top",
+      "y": 90
+    },
+    "facing=north,half=upper,hinge=right,open=true": {
+      "model": "glassdoor:block/acacia_door_top",
+      "y": 180
+    }
+  }
+}