spotless and remove fd dependency in publishMods

MarbleGateKeeper · MarbleGateKeeper · commit 6a1540e4e0d7 · 2025-09-04T23:05:52.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -263,7 +263,6 @@ publishMods {
         requires {
             slug = "create"
             slug = "create-dragons-plus"
-            slug = "farmers-delight"
         }
     }
 
@@ -275,7 +274,6 @@ publishMods {
         requires {
             slug = "create"
             slug = "create-dragons-plus"
-            slug = "farmers-delight"
         }
     }
 }
diff --git a/src/integration/crabberdelight/java/plus/dragons/createintegratedfarming/integration/crabbersdelight/fishing/CrabTrapArmInteractionPoint.java b/src/integration/crabberdelight/java/plus/dragons/createintegratedfarming/integration/crabbersdelight/fishing/CrabTrapArmInteractionPoint.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2025  DragonsPlus
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package plus.dragons.createintegratedfarming.integration.crabbersdelight.fishing;
 
 import alabaster.crabbersdelight.common.block.entity.CrabTrapBlockEntity;
@@ -19,18 +37,18 @@ public CrabTrapArmInteractionPoint(ArmInteractionPointType type, Level level, Bl
 
     @Override
     public ItemStack insert(ArmBlockEntity armBlockEntity, ItemStack stack, boolean simulate) {
-        if(level.getBlockEntity(pos) instanceof CrabTrapBlockEntity interaction){
+        if (level.getBlockEntity(pos) instanceof CrabTrapBlockEntity interaction) {
             var cap = level.getCapability(Capabilities.ItemHandler.BLOCK, pos, level.getBlockState(pos), interaction, Direction.UP);
-            if(cap!=null) return cap.insertItem(0, stack, simulate);
+            if (cap != null) return cap.insertItem(0, stack, simulate);
         }
         return stack;
     }
 
     @Override
     public ItemStack extract(ArmBlockEntity armBlockEntity, int slot, int amount, boolean simulate) {
-        if(level.getBlockEntity(pos) instanceof CrabTrapBlockEntity interaction){
+        if (level.getBlockEntity(pos) instanceof CrabTrapBlockEntity interaction) {
             var cap = level.getCapability(Capabilities.ItemHandler.BLOCK, pos, level.getBlockState(pos), interaction, Direction.DOWN);
-            if(cap!=null) return cap.extractItem(slot, amount, simulate);
+            if (cap != null) return cap.extractItem(slot, amount, simulate);
         }
         return ItemStack.EMPTY;
     }
diff --git a/src/integration/crabberdelight/java/plus/dragons/createintegratedfarming/integration/crabbersdelight/ponder/CrabbersDelightPonderPlugin.java b/src/integration/crabberdelight/java/plus/dragons/createintegratedfarming/integration/crabbersdelight/ponder/CrabbersDelightPonderPlugin.java
@@ -18,15 +18,15 @@
 
 package plus.dragons.createintegratedfarming.integration.crabbersdelight.ponder;
 
+import static com.simibubi.create.infrastructure.ponder.AllCreatePonderTags.ARM_TARGETS;
+
 import alabaster.crabbersdelight.common.registry.CDModBlocks;
 import net.createmod.ponder.api.registration.PonderTagRegistrationHelper;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import plus.dragons.createintegratedfarming.client.ponder.CIFPonderPlugin;
 import plus.dragons.createintegratedfarming.client.ponder.CIFPonderTags;
 
-import static com.simibubi.create.infrastructure.ponder.AllCreatePonderTags.ARM_TARGETS;
-
 public class CrabbersDelightPonderPlugin {
     public static void register() {
         CIFPonderPlugin.TAGS.add(CrabbersDelightPonderPlugin::registerTags);
diff --git a/src/integration/crabberdelight/java/plus/dragons/createintegratedfarming/integration/crabbersdelight/registry/CrabbersDelightArmInteractionPointTypes.java b/src/integration/crabberdelight/java/plus/dragons/createintegratedfarming/integration/crabbersdelight/registry/CrabbersDelightArmInteractionPointTypes.java
@@ -18,13 +18,13 @@
 
 package plus.dragons.createintegratedfarming.integration.crabbersdelight.registry;
 
+import static plus.dragons.createintegratedfarming.common.registry.CIFArmInteractionPoints.holder;
+
 import com.simibubi.create.content.kinetics.mechanicalArm.ArmInteractionPointType;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import plus.dragons.createintegratedfarming.common.registry.CIFArmInteractionPoints;
 import plus.dragons.createintegratedfarming.integration.crabbersdelight.fishing.CrabTrapArmInteractionPoint;
 
-import static plus.dragons.createintegratedfarming.common.registry.CIFArmInteractionPoints.holder;
-
 public class CrabbersDelightArmInteractionPointTypes {
     //spotless:off
     public static final DeferredHolder<ArmInteractionPointType, ArmInteractionPointType>
diff --git a/src/integration/farmersdelight/java/plus/dragons/createintegratedfarming/integration/farmersdelight/data/FDRecipeProvider.java b/src/integration/farmersdelight/java/plus/dragons/createintegratedfarming/integration/farmersdelight/data/FDRecipeProvider.java
@@ -18,16 +18,6 @@
 
 package plus.dragons.createintegratedfarming.integration.farmersdelight.data;
 
-import com.tterrag.registrate.providers.RegistrateRecipeProvider;
-import net.minecraft.core.HolderLookup.Provider;
-import net.minecraft.data.PackOutput;
-import net.minecraft.data.recipes.RecipeOutput;
-import net.neoforged.neoforge.common.Tags;
-import plus.dragons.createintegratedfarming.common.CIFCommon;
-import plus.dragons.createintegratedfarming.integration.ModIntegration;
-
-import java.util.concurrent.CompletableFuture;
-
 import static com.simibubi.create.AllItems.ANDESITE_ALLOY;
 import static net.minecraft.world.item.Items.BAMBOO;
 import static net.minecraft.world.item.Items.WHEAT;
@@ -37,6 +27,15 @@
 import static vectorwing.farmersdelight.common.registry.ModItems.CANVAS;
 import static vectorwing.farmersdelight.common.registry.ModItems.SAFETY_NET;
 
+import com.tterrag.registrate.providers.RegistrateRecipeProvider;
+import java.util.concurrent.CompletableFuture;
+import net.minecraft.core.HolderLookup.Provider;
+import net.minecraft.data.PackOutput;
+import net.minecraft.data.recipes.RecipeOutput;
+import net.neoforged.neoforge.common.Tags;
+import plus.dragons.createintegratedfarming.common.CIFCommon;
+import plus.dragons.createintegratedfarming.integration.ModIntegration;
+
 public class FDRecipeProvider extends RegistrateRecipeProvider {
     public FDRecipeProvider(PackOutput output, CompletableFuture<Provider> registries) {
         super(CIFCommon.REGISTRATE, output, registries);
diff --git a/src/integration/mynethersdelight/java/plus/dragons/createintegratedfarming/integration/mynethersdelight/farming/harvest/PowderyCannonArmInteractionPoint.java b/src/integration/mynethersdelight/java/plus/dragons/createintegratedfarming/integration/mynethersdelight/farming/harvest/PowderyCannonArmInteractionPoint.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2025  DragonsPlus
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package plus.dragons.createintegratedfarming.integration.mynethersdelight.farming.harvest;
 
 import com.simibubi.create.content.kinetics.mechanicalArm.ArmBlockEntity;
@@ -26,13 +44,13 @@ public Mode getMode() {
     @Override
     public ItemStack extract(ArmBlockEntity armBlockEntity, int slot, int amount, boolean simulate) {
         BlockState state = level.getBlockState(pos);
-        if((state.getBlock() instanceof PowderyCaneBlock || state.getBlock() instanceof PowderyCannonBlock) && state.getValue(BlockStateProperties.LIT)) {
-            if(!simulate) {
+        if ((state.getBlock() instanceof PowderyCaneBlock || state.getBlock() instanceof PowderyCannonBlock) && state.getValue(BlockStateProperties.LIT)) {
+            if (!simulate) {
                 state = state.setValue(BlockStateProperties.LIT, false);
                 level.setBlockAndUpdate(pos, state);
             }
             int j = 1 + level.random.nextInt(2);
-            return new ItemStack(MNDItems.BULLET_PEPPER.get(),j);
+            return new ItemStack(MNDItems.BULLET_PEPPER.get(), j);
         }
         return ItemStack.EMPTY;
     }
diff --git a/src/integration/mynethersdelight/java/plus/dragons/createintegratedfarming/integration/mynethersdelight/ponder/MNDPonderPlugin.java b/src/integration/mynethersdelight/java/plus/dragons/createintegratedfarming/integration/mynethersdelight/ponder/MNDPonderPlugin.java
@@ -18,6 +18,8 @@
 
 package plus.dragons.createintegratedfarming.integration.mynethersdelight.ponder;
 
+import static com.simibubi.create.infrastructure.ponder.AllCreatePonderTags.ARM_TARGETS;
+
 import com.simibubi.create.AllBlocks;
 import com.soytutta.mynethersdelight.common.registry.MNDBlocks;
 import net.createmod.ponder.api.registration.PonderSceneRegistrationHelper;
@@ -27,8 +29,6 @@
 import plus.dragons.createintegratedfarming.client.ponder.CIFPonderPlugin;
 import plus.dragons.createintegratedfarming.client.ponder.CIFPonderTags;
 
-import static com.simibubi.create.infrastructure.ponder.AllCreatePonderTags.ARM_TARGETS;
-
 public class MNDPonderPlugin {
     public static void register() {
         CIFPonderPlugin.SCENES.add(MNDPonderPlugin::registerScenes);
diff --git a/src/integration/mynethersdelight/java/plus/dragons/createintegratedfarming/integration/mynethersdelight/ponder/MNDPonderScenes.java b/src/integration/mynethersdelight/java/plus/dragons/createintegratedfarming/integration/mynethersdelight/ponder/MNDPonderScenes.java
@@ -70,5 +70,4 @@ public static void catalyze(SceneBuilder builder, SceneBuildingUtil util) {
         scene.idle(20);
         scene.world().modifyBlock(leteosCompost, bs -> MNDBlocks.RESURGENT_SOIL.get().defaultBlockState(), false);
     }
-
 }
diff --git a/src/integration/mynethersdelight/java/plus/dragons/createintegratedfarming/integration/mynethersdelight/registry/MNDArmInteractionPointTypes.java b/src/integration/mynethersdelight/java/plus/dragons/createintegratedfarming/integration/mynethersdelight/registry/MNDArmInteractionPointTypes.java
@@ -18,13 +18,13 @@
 
 package plus.dragons.createintegratedfarming.integration.mynethersdelight.registry;
 
+import static plus.dragons.createintegratedfarming.common.registry.CIFArmInteractionPoints.holder;
+
 import com.simibubi.create.content.kinetics.mechanicalArm.ArmInteractionPointType;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import plus.dragons.createintegratedfarming.common.registry.CIFArmInteractionPoints;
 import plus.dragons.createintegratedfarming.integration.mynethersdelight.farming.harvest.PowderyCannonArmInteractionPoint;
 
-import static plus.dragons.createintegratedfarming.common.registry.CIFArmInteractionPoints.holder;
-
 public class MNDArmInteractionPointTypes {
     //spotless:off
     public static final DeferredHolder<ArmInteractionPointType, ArmInteractionPointType>
diff --git a/src/main/java/plus/dragons/createintegratedfarming/client/ponder/CIFPonderTags.java b/src/main/java/plus/dragons/createintegratedfarming/client/ponder/CIFPonderTags.java
@@ -19,7 +19,6 @@
 package plus.dragons.createintegratedfarming.client.ponder;
 
 import static com.simibubi.create.infrastructure.ponder.AllCreatePonderTags.ARM_TARGETS;
-import static com.simibubi.create.infrastructure.ponder.AllCreatePonderTags.CONTRAPTION_ACTOR;
 
 import com.simibubi.create.AllBlocks;
 import com.tterrag.registrate.util.entry.RegistryEntry;
diff --git a/src/main/java/plus/dragons/createintegratedfarming/common/ranching/roost/chicken/ChickenRoostBlock.java b/src/main/java/plus/dragons/createintegratedfarming/common/ranching/roost/chicken/ChickenRoostBlock.java
@@ -161,7 +161,7 @@ public InteractionResult captureItem(Level level, ItemStack stack, InteractionHa
             if (player.hasInfiniteMaterials())
                 player.getInventory().placeItemBackInInventory(new ItemStack(this));
             else {
-                if(stack.getCount()==1) player.setItemInHand(hand,new ItemStack(this));
+                if (stack.getCount() == 1) player.setItemInHand(hand, new ItemStack(this));
                 else {
                     player.getInventory().placeItemBackInInventory(new ItemStack(this));
                     stack.shrink(1);
diff --git a/src/main/java/plus/dragons/createintegratedfarming/integration/package-info.java b/src/main/java/plus/dragons/createintegratedfarming/integration/package-info.java
@@ -3,7 +3,6 @@
 @ParametersAreNonnullByDefault
 package plus.dragons.createintegratedfarming.integration;
 
+import javax.annotation.ParametersAreNonnullByDefault;
 import net.minecraft.FieldsAreNonnullByDefault;
 import net.minecraft.MethodsReturnNonnullByDefault;
-
-import javax.annotation.ParametersAreNonnullByDefault;

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,6 @@ publishMods {`
`263`	`263`	`requires {`
`264`	`264`	`slug = "create"`
`265`	`265`	`slug = "create-dragons-plus"`
`266`		`- slug = "farmers-delight"`
`267`	`266`	`}`
`268`	`267`	`}`
`269`	`268`
`@@ -275,7 +274,6 @@ publishMods {`
`275`	`274`	`requires {`
`276`	`275`	`slug = "create"`
`277`	`276`	`slug = "create-dragons-plus"`
`278`		`- slug = "farmers-delight"`
`279`	`277`	`}`
`280`	`278`	`}`
`281`	`279`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,5 +70,4 @@ public static void catalyze(SceneBuilder builder, SceneBuildingUtil util) {`
`70`	`70`	`scene.idle(20);`
`71`	`71`	`scene.world().modifyBlock(leteosCompost, bs -> MNDBlocks.RESURGENT_SOIL.get().defaultBlockState(), false);`
`72`	`72`	`}`
`73`		`-`
`74`	`73`	`}`