clean sth. change icon, rename

Author: TexBlock

gradle.properties

@@ -11,19 +11,5 @@ loom.platform = neoforge
 # Mod Properties
 	mod_main_version = 0.1.1
 	carpet_version = 1.4.147
-	maven_group = org.thinkingstudio.sheet
-	archives_base_name = sheet
-
-# Release Action properties for Curseforge and Snapshots
-	# The Curseforge versions "names" or ids for the main branch (comma separated: 1.16.4,1.16.5)
-	# This is needed because CF uses too vague names for prereleases and release candidates
-	# Can also be the version ID directly coming from https://minecraft.curseforge.com/api/game/versions?token=[API_TOKEN]
-	release-curse-versions = Minecraft 1.21:1.21.4
-	# Whether or not to build another branch on release
-	release-extra-branch = false
-	# The name of the second branch to release
-	release-extra-branch-name = 1.20.4
-	# The "name" or id of the Curseforge version for the secondary branch
-	# This is needed because CF uses too vague names for snapshots
-	# Can also be the version ID directly coming from https://minecraft.curseforge.com/api/game/versions?token=[API_TOKEN]
-	release-extra-curse-version = Minecraft 1.20:1.20.4-Snapshot
+	maven_group = org.thinkingstudio.bedsheet
+	archives_base_name = bedsheet

src/main/java/carpet/CarpetServer.java

@@ -39,7 +39,7 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.commands.PerfCommand;
 import net.minecraft.server.level.ServerPlayer;
-import org.thinkingstudio.sheet.util.NeoHooks;
+import org.thinkingstudio.bedsheet.util.NeoHooks;
 
 @SuppressWarnings("removal")
 public class CarpetServer // static for now - easier to handle all around the code, its one anyways

src/main/java/carpet/CarpetSettings.java

@@ -30,8 +30,8 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.thinkingstudio.sheet.util.NeoHooks;
-import org.thinkingstudio.sheet.SheetModReference;
+import org.thinkingstudio.bedsheet.util.NeoHooks;
+import org.thinkingstudio.bedsheet.BedSheetModReference;
 
 import java.util.Optional;
 
@@ -50,12 +50,12 @@
 @SuppressWarnings({"CanBeFinal", "removal"}) // removal should be removed after migrating rules to the new system
 public class CarpetSettings
 {
-    public static final String carpetVersion = NeoHooks.getModContainer(SheetModReference.MODID).orElseThrow().getModInfo().getVersion().toString();
+    public static final String carpetVersion = NeoHooks.getModContainer(BedSheetModReference.MODID).orElseThrow().getModInfo().getVersion().toString();
     public static final int [] releaseTarget =  {
             NeoHooks.getModContainer("minecraft").orElseThrow().getModInfo().getVersion().getMajorVersion(),
             NeoHooks.getModContainer("minecraft").orElseThrow().getModInfo().getVersion().getIncrementalVersion()
     };
-    public static final Logger LOG = LoggerFactory.getLogger(SheetModReference.MODNAME);
+    public static final Logger LOG = LoggerFactory.getLogger(BedSheetModReference.MODNAME);
     public static final ThreadLocal<Boolean> skipGenerationChecks = ThreadLocal.withInitial(() -> false);
     public static final ThreadLocal<Boolean> impendingFillSkipUpdates = ThreadLocal.withInitial(() -> false);
     public static int runPermissionLevel = 2;

src/main/java/carpet/api/settings/SettingsManager.java

@@ -53,7 +53,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.storage.LevelResource;
-import org.thinkingstudio.sheet.util.NeoHooks;
+import org.thinkingstudio.bedsheet.util.NeoHooks;
 
 import static carpet.utils.Translations.tr;
 import static java.util.Comparator.comparing;

src/main/java/carpet/mixins/PistonStructureResolver_customStickyMixin.java

@@ -17,7 +17,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.piston.PistonStructureResolver;
 import net.minecraft.world.level.block.state.BlockState;
-import org.thinkingstudio.sheet.util.PistonStructureResolverHooks;
+import org.thinkingstudio.bedsheet.util.PistonStructureResolverHooks;
 
 @Mixin(PistonStructureResolver.class)
 public class PistonStructureResolver_customStickyMixin {

src/main/java/carpet/script/external/Carpet.java

@@ -36,7 +36,7 @@
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.artifact.versioning.VersionRange;
-import org.thinkingstudio.sheet.util.NeoHooks;
+import org.thinkingstudio.bedsheet.util.NeoHooks;
 
 import javax.annotation.Nullable;
 import java.io.IOException;

src/main/java/carpet/script/external/Vanilla.java

@@ -74,7 +74,7 @@
 import net.minecraft.world.scores.Scoreboard;
 import net.minecraft.world.scores.criteria.ObjectiveCriteria;
 import net.neoforged.neoforgespi.language.IModInfo;
-import org.thinkingstudio.sheet.util.NeoHooks;
+import org.thinkingstudio.bedsheet.util.NeoHooks;
 
 import java.util.HashMap;
 import java.util.List;

src/main/java/carpet/utils/CarpetRulePrinter.java

@@ -17,7 +17,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.thinkingstudio.sheet.util.NeoHooks;
+import org.thinkingstudio.bedsheet.util.NeoHooks;
 
 /**
  * Provides a command line interface to generate a dump with all rules

src/main/java/org/thinkingstudio/sheet/SheetModEntrypoint.java renamed to src/main/java/org/thinkingstudio/bedsheet/BedSheetModEntrypoint.java

@@ -1,4 +1,4 @@
-package org.thinkingstudio.sheet;
+package org.thinkingstudio.bedsheet;
 
 import carpet.CarpetServer;
 import carpet.utils.CarpetRulePrinter;
@@ -7,11 +7,11 @@
 import net.neoforged.fml.loading.FMLLoader;
 import net.neoforged.neoforge.common.NeoForge;
 
-@Mod(SheetModReference.MODID)
-public class SheetModEntrypoint {
-    public SheetModEntrypoint(IEventBus modEventBus) {
+@Mod(BedSheetModReference.MODID)
+public class BedSheetModEntrypoint {
+    public BedSheetModEntrypoint(IEventBus modEventBus) {
         CarpetServer.onGameStarted();
-        SheetModEvents.registerEvents(modEventBus, NeoForge.EVENT_BUS);
+        BedSheetModEvents.registerEvents(modEventBus, NeoForge.EVENT_BUS);
         if (FMLLoader.getDist().isDedicatedServer()) {
             CarpetRulePrinter.onInitializeServer();
         }

src/main/java/org/thinkingstudio/sheet/SheetModEvents.java renamed to src/main/java/org/thinkingstudio/bedsheet/BedSheetModEvents.java

@@ -1,4 +1,4 @@
-package org.thinkingstudio.sheet;
+package org.thinkingstudio.bedsheet;
 
 import carpet.CarpetServer;
 import carpet.fakes.EntityInterface;
@@ -17,7 +17,7 @@
 import static carpet.script.CarpetEventServer.Event.PLAYER_DIES;
 import static carpet.script.CarpetEventServer.Event.PLAYER_SWAPS_HANDS;
 
-public class SheetModEvents {
+public class BedSheetModEvents {
     public static void registerEvents(IEventBus modEventBus, IEventBus forgeEventBus) {
         forgeEventBus.addListener(EventPriority.HIGHEST, RegisterCommandsEvent.class, event -> {
             CarpetServer.registerCarpetCommands(event.getDispatcher(), event.getCommandSelection(), event.getBuildContext());
@@ -43,7 +43,7 @@ public static void registerEvents(IEventBus modEventBus, IEventBus forgeEventBus
 
 
         modEventBus.addListener(EventPriority.HIGHEST, RegisterPayloadHandlersEvent.class, event -> {
-            final PayloadRegistrar registrar = event.registrar(SheetModReference.MODID);
+            final PayloadRegistrar registrar = event.registrar(BedSheetModReference.MODID);
 
             registrar.playBidirectional(CarpetClient.CarpetPayload.TYPE, CarpetClient.CarpetPayload.STREAM_CODEC,
                     (payload, context) -> context.handle(payload)