From 77bcaf1b48fd94d90755eb9a9360601ba5414904 Mon Sep 17 00:00:00 2001
From: SHsuperCM <shsupercm@gmail.com>
Date: Wed, 16 Feb 2022 15:31:18 +0200
Subject: Moved some stuff around

---
 .../fabric/citresewn/cit/CITRegistry.java          |  2 +-
 .../citresewn/cit/builtin/AlwaysFailCondition.java | 19 ---------------
 .../citresewn/cit/builtin/WeightCondition.java     | 27 ----------------------
 .../builtin/conditions/AlwaysFailCondition.java    | 19 +++++++++++++++
 .../cit/builtin/conditions/WeightCondition.java    | 27 ++++++++++++++++++++++
 .../fabric/citresewn/pack/PackParser.java          |  2 +-
 6 files changed, 48 insertions(+), 48 deletions(-)
 delete mode 100644 src/main/java/shcm/shsupercm/fabric/citresewn/cit/builtin/AlwaysFailCondition.java
 delete mode 100644 src/main/java/shcm/shsupercm/fabric/citresewn/cit/builtin/WeightCondition.java
 create mode 100644 src/main/java/shcm/shsupercm/fabric/citresewn/cit/builtin/conditions/AlwaysFailCondition.java
 create mode 100644 src/main/java/shcm/shsupercm/fabric/citresewn/cit/builtin/conditions/WeightCondition.java

(limited to 'src')

diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITRegistry.java b/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITRegistry.java
index af8f430..53a5226 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITRegistry.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITRegistry.java
@@ -4,7 +4,7 @@ import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.util.Identifier;
 import shcm.shsupercm.fabric.citresewn.api.CITConditionContainer;
 import shcm.shsupercm.fabric.citresewn.api.CITTypeContainer;
-import shcm.shsupercm.fabric.citresewn.cit.builtin.AlwaysFailCondition;
+import shcm.shsupercm.fabric.citresewn.cit.builtin.conditions.AlwaysFailCondition;
 import shcm.shsupercm.fabric.citresewn.ex.CITParsingException;
 import shcm.shsupercm.fabric.citresewn.ex.UnknownCITTypeException;
 import shcm.shsupercm.fabric.citresewn.pack.format.PropertyGroup;
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/cit/builtin/AlwaysFailCondition.java b/src/main/java/shcm/shsupercm/fabric/citresewn/cit/builtin/AlwaysFailCondition.java
deleted file mode 100644
index f385ae9..0000000
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/cit/builtin/AlwaysFailCondition.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package shcm.shsupercm.fabric.citresewn.cit.builtin;
-
-import shcm.shsupercm.fabric.citresewn.cit.CITCondition;
-import shcm.shsupercm.fabric.citresewn.cit.CITContext;
-import shcm.shsupercm.fabric.citresewn.ex.CITParsingException;
-import shcm.shsupercm.fabric.citresewn.pack.format.PropertyGroup;
-import shcm.shsupercm.fabric.citresewn.pack.format.PropertyValue;
-
-public class AlwaysFailCondition extends CITCondition {
-    @Override
-    public void load(PropertyValue value, PropertyGroup properties) throws CITParsingException {
-
-    }
-
-    @Override
-    public boolean test(CITContext context) {
-        return false;
-    }
-}
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/cit/builtin/WeightCondition.java b/src/main/java/shcm/shsupercm/fabric/citresewn/cit/builtin/WeightCondition.java
deleted file mode 100644
index ec0a5d7..0000000
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/cit/builtin/WeightCondition.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package shcm.shsupercm.fabric.citresewn.cit.builtin;
-
-import io.shcm.shsupercm.fabric.fletchingtable.api.Entrypoint;
-import shcm.shsupercm.fabric.citresewn.api.CITConditionContainer;
-import shcm.shsupercm.fabric.citresewn.ex.CITParsingException;
-import shcm.shsupercm.fabric.citresewn.cit.CITCondition;
-import shcm.shsupercm.fabric.citresewn.cit.CITContext;
-import shcm.shsupercm.fabric.citresewn.pack.format.PropertyGroup;
-import shcm.shsupercm.fabric.citresewn.pack.format.PropertyValue;
-
-public class WeightCondition extends CITCondition {
-    @Entrypoint(CITConditionContainer.ENTRYPOINT)
-    public static final CITConditionContainer<WeightCondition> CONTAINER = new CITConditionContainer<>(WeightCondition.class, WeightCondition::new,
-            "weight");
-
-    public int weight = 0;
-
-    @Override
-    public void load(PropertyValue value, PropertyGroup properties) throws CITParsingException {
-        this.weight = parseInteger(value, properties);
-    }
-
-    @Override
-    public boolean test(CITContext context) {
-        return true;
-    }
-}
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/cit/builtin/conditions/AlwaysFailCondition.java b/src/main/java/shcm/shsupercm/fabric/citresewn/cit/builtin/conditions/AlwaysFailCondition.java
new file mode 100644
index 0000000..5c32d97
--- /dev/null
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/cit/builtin/conditions/AlwaysFailCondition.java
@@ -0,0 +1,19 @@
+package shcm.shsupercm.fabric.citresewn.cit.builtin.conditions;
+
+import shcm.shsupercm.fabric.citresewn.cit.CITCondition;
+import shcm.shsupercm.fabric.citresewn.cit.CITContext;
+import shcm.shsupercm.fabric.citresewn.ex.CITParsingException;
+import shcm.shsupercm.fabric.citresewn.pack.format.PropertyGroup;
+import shcm.shsupercm.fabric.citresewn.pack.format.PropertyValue;
+
+public class AlwaysFailCondition extends CITCondition {
+    @Override
+    public void load(PropertyValue value, PropertyGroup properties) throws CITParsingException {
+
+    }
+
+    @Override
+    public boolean test(CITContext context) {
+        return false;
+    }
+}
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/cit/builtin/conditions/WeightCondition.java b/src/main/java/shcm/shsupercm/fabric/citresewn/cit/builtin/conditions/WeightCondition.java
new file mode 100644
index 0000000..54f26ff
--- /dev/null
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/cit/builtin/conditions/WeightCondition.java
@@ -0,0 +1,27 @@
+package shcm.shsupercm.fabric.citresewn.cit.builtin.conditions;
+
+import io.shcm.shsupercm.fabric.fletchingtable.api.Entrypoint;
+import shcm.shsupercm.fabric.citresewn.api.CITConditionContainer;
+import shcm.shsupercm.fabric.citresewn.ex.CITParsingException;
+import shcm.shsupercm.fabric.citresewn.cit.CITCondition;
+import shcm.shsupercm.fabric.citresewn.cit.CITContext;
+import shcm.shsupercm.fabric.citresewn.pack.format.PropertyGroup;
+import shcm.shsupercm.fabric.citresewn.pack.format.PropertyValue;
+
+public class WeightCondition extends CITCondition {
+    @Entrypoint(CITConditionContainer.ENTRYPOINT)
+    public static final CITConditionContainer<WeightCondition> CONTAINER = new CITConditionContainer<>(WeightCondition.class, WeightCondition::new,
+            "weight");
+
+    public int weight = 0;
+
+    @Override
+    public void load(PropertyValue value, PropertyGroup properties) throws CITParsingException {
+        this.weight = parseInteger(value, properties);
+    }
+
+    @Override
+    public boolean test(CITContext context) {
+        return true;
+    }
+}
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java b/src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java
index 70e3f75..5096543 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java
@@ -5,7 +5,7 @@ import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.resource.*;
 import net.minecraft.util.Identifier;
 import shcm.shsupercm.fabric.citresewn.CITResewn;
-import shcm.shsupercm.fabric.citresewn.cit.builtin.WeightCondition;
+import shcm.shsupercm.fabric.citresewn.cit.builtin.conditions.WeightCondition;
 import shcm.shsupercm.fabric.citresewn.ex.CITParsingException;
 import shcm.shsupercm.fabric.citresewn.mixin.GroupResourcePackAccessor;
 import shcm.shsupercm.fabric.citresewn.cit.CIT;
-- 
cgit