InFunnelCondition -> FunnelCondition because I forgot to rename it ea…

…rlier
Fusion-Flux · Jul 21, 2023 · 3e1bbf3 · 3e1bbf3
1 parent 8e8a7eb
commit 3e1bbf3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...alcubed/predicates/InFunnelCondition.java → ...rtalcubed/predicates/FunnelCondition.java b/...alcubed/predicates/InFunnelCondition.java → ...rtalcubed/predicates/FunnelCondition.java
@@ -16,11 +16,11 @@
 
 import java.util.Set;
 
-public class InFunnelCondition implements LootItemCondition {
+public class FunnelCondition implements LootItemCondition {
     private final Boolean inFunnel;
     private final Boolean inCfg;
 
-    public InFunnelCondition(Boolean inFunnel, Boolean inCfg) {
+    public FunnelCondition(Boolean inFunnel, Boolean inCfg) {
         this.inFunnel = inFunnel;
         this.inCfg = inCfg;
     }
@@ -49,19 +49,19 @@ public boolean test(LootContext lootContext) {
         return true;
     }
 
-    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<InFunnelCondition> {
+    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<FunnelCondition> {
         @Override
-        public void serialize(JsonObject json, InFunnelCondition value, JsonSerializationContext serializationContext) {
+        public void serialize(JsonObject json, FunnelCondition value, JsonSerializationContext serializationContext) {
             json.addProperty("in_funnel", value.inFunnel);
         }
 
         @NotNull
         @Override
-        public InFunnelCondition deserialize(JsonObject json, JsonDeserializationContext serializationContext) {
+        public FunnelCondition deserialize(JsonObject json, JsonDeserializationContext serializationContext) {
             if (!json.has("in_funnel") && !json.has("in_cfg")) {
                 throw new JsonSyntaxException("portalcubed:funnel condition must have either in_funnel or in_cfg");
             }
-            return new InFunnelCondition(
+            return new FunnelCondition(
                 getAsOptionalBoolean(json, "in_funnel"),
                 getAsOptionalBoolean(json, "in_cfg")
             );

diff --git a/src/main/java/com/fusionflux/portalcubed/predicates/PortalCubedConditions.java b/src/main/java/com/fusionflux/portalcubed/predicates/PortalCubedConditions.java
@@ -7,7 +7,7 @@
 import static com.fusionflux.portalcubed.PortalCubed.id;
 
 public class PortalCubedConditions {
-    public static final LootItemConditionType FUNNEL = new LootItemConditionType(new InFunnelCondition.Serializer());
+    public static final LootItemConditionType FUNNEL = new LootItemConditionType(new FunnelCondition.Serializer());
 
     public static void register() {
         Registry.register(BuiltInRegistries.LOOT_CONDITION_TYPE, id("funnel"), FUNNEL);