chore: clean up registries

build.gradle

@@ -113,7 +113,7 @@ dependencies {
 	modApiInclude("dev.vini2003:hammer-gui:$hammerVersion")
 
 	// Hammer GUI Energy
-	// modApiInclude("dev.vini2003:hammer-gui-energy:$hammerVersion")
+	 modApiInclude("dev.vini2003:hammer-gui-energy:$hammerVersion")
 
 	// Hammer Gravity
 	modApiInclude("dev.vini2003:hammer-gravity:$hammerVersion")

gradle.properties

@@ -27,7 +27,7 @@ shapesVersion = 7.0.1
 
 ## Hammer
 # On Maven at https://maven.vini2003.dev/#/releases/dev/vini2003/hammer/
-hammerVersion = 0.10.19
+hammerVersion = 0.10.21
 
 ## Patchouli
 # On Maven at https://maven.blamejared.com/vazkii/patchouli/Patchouli/

src/main/java/com/github/mixinors/astromine/AMClient.java

@@ -25,7 +25,6 @@
 package com.github.mixinors.astromine;
 
 import com.github.mixinors.astromine.registry.client.*;
-import com.github.mixinors.astromine.registry.common.AMKeyBinds;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -46,7 +45,6 @@ public void onInitializeClient() {
 		AMNetworking.init();
 		AMRenderLayers.init();
 		AMPatchouliPages.init();
-		AMKeyBinds.init();
 		AMColorProviders.init();
 		AMKeyBindings.init();
 	}

src/main/java/com/github/mixinors/astromine/AMCommon.java

@@ -65,8 +65,6 @@ public static <T> Registrar<T> registry(RegistryKey<Registry<T>> key) {
     @Override
     public void onInitialize() {
         AMConfig.init();
-        AMAttributes.init();
-        AMIdentifierFixes.init();
         AMWorlds.init();
         AMFeatures.init();
         AMStructureTypes.init();

src/main/java/com/github/mixinors/astromine/client/screen/IsometricCameraScreen.java

@@ -1,20 +1,13 @@
 package com.github.mixinors.astromine.client.screen;
 
-import com.github.mixinors.astromine.AMClient;
 import com.github.mixinors.astromine.client.util.IsometricCameraHandler;
 import com.github.mixinors.astromine.common.entity.IsometricCameraEntity;
 import com.github.mixinors.astromine.registry.client.AMKeyBindings;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
-import net.minecraft.util.hit.BlockHitResult;
-import net.minecraft.util.hit.HitResult.Type;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.RaycastContext;
-import net.minecraft.world.RaycastContext.FluidHandling;
-import net.minecraft.world.RaycastContext.ShapeType;
 
 public class IsometricCameraScreen extends Screen {private boolean sneakPressed;
     private boolean forwardPressed;
@@ -44,18 +37,18 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
 
         if (super.keyPressed(keyCode, scanCode, modifiers)) {
             return true;
-        } else if (AMKeyBindings.toggleCamera.matchesKey(keyCode, scanCode)) {
+        } else if (AMKeyBindings.TOGGLE_CAMERA.matchesKey(keyCode, scanCode)) {
             this.close();
             return true;
-        } else if (AMKeyBindings.rotateCameraLeft.matchesKey(keyCode, scanCode)) {
+        } else if (AMKeyBindings.ROTATE_CAMERA_LEFT.matchesKey(keyCode, scanCode)) {
             if (cameraEntity.getYaw() > 45) {
                 cameraEntity.setYaw(cameraEntity.getYaw() - 90);
             } else {
                 cameraEntity.setYaw(315);
             }
 
             return true;
-        } else if (AMKeyBindings.rotateCameraRight.matchesKey(keyCode, scanCode)) {
+        } else if (AMKeyBindings.ROTATE_CAMERA_RIGHT.matchesKey(keyCode, scanCode)) {
             if (cameraEntity.getYaw() < 315) {
                 cameraEntity.setYaw(cameraEntity.getYaw() + 90);
             } else {

src/main/java/com/github/mixinors/astromine/client/util/IsometricCameraHandler.java

@@ -6,6 +6,7 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.Perspective;
 import net.minecraft.text.Text;
+import net.minecraft.world.World;
 
 public class IsometricCameraHandler {
     public static float speed = 2;
@@ -41,8 +42,8 @@ public static void stopCamera() {
         }
     }
 
-    public static void tick() {
-        while (AMKeyBindings.toggleCamera.wasPressed()) {
+    public static void onEndWorldTick(World world) {
+        while (AMKeyBindings.TOGGLE_CAMERA.wasPressed()) {
             client.player.sendMessage(Text.literal("Toggle Camera was pressed!"), false);
             client.setScreen(new IsometricCameraScreen());
         }

src/main/java/com/github/mixinors/astromine/common/component/world/NetworksComponent.java

@@ -34,6 +34,8 @@
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.nbt.NbtList;
 import net.minecraft.nbt.NbtLong;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.NotNull;
@@ -64,6 +66,14 @@ public static <V> NetworksComponent get(V v) {
 	public NetworksComponent(World world) {
 		this.world = world;
 	}
+
+	public static void onServerLevelPre(ServerWorld world) {
+		var component = get(world);
+
+		if (component != null) {
+			component.tick();
+		}
+	}
 
 	public World getWorld() {
 		return world;

src/main/java/com/github/mixinors/astromine/common/entity/slime/SuperSpaceSlimeEntity.java

@@ -46,9 +46,13 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.EntityHitResult;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.ServerWorldAccess;
 import net.minecraft.world.World;
+import org.jetbrains.annotations.Nullable;
 
 public class SuperSpaceSlimeEntity extends MobEntity implements Monster {
 	private static final String HAS_EXPLODED_KEY = "HasExploded";
@@ -84,7 +88,20 @@ public SuperSpaceSlimeEntity(EntityType<? extends SuperSpaceSlimeEntity> entityT
 	public static DefaultAttributeContainer.Builder createAttributes() {
 		return MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 5).add(EntityAttributes.GENERIC_MAX_HEALTH, 300);
 	}
-
+
+	public static ActionResult onAttackEntity(PlayerEntity player, World world, Hand hand, Entity entity, @Nullable EntityHitResult hitResult) {
+		if (entity instanceof SuperSpaceSlimeEntity) {
+			if (world.random.nextInt(10) == 0) {
+				var spaceSlimeEntity = AMEntityTypes.SPACE_SLIME.get().create(world);
+				spaceSlimeEntity.setPos(entity.getX(), entity.getY(), entity.getZ());
+
+				world.spawnEntity(spaceSlimeEntity);
+			}
+		}
+
+		return ActionResult.PASS;
+	}
+
 	@Override
 	public void initGoals() {
 		this.goalSelector.add(0, new SuperSpaceSlimeExplosionGoal(this));

src/main/java/com/github/mixinors/astromine/common/screen/handler/base/block/entity/ExtendedBlockEntityScreenHandler.java

@@ -27,6 +27,7 @@
 import com.github.mixinors.astromine.common.block.base.HorizontalFacingBlockWithEntity;
 import com.github.mixinors.astromine.common.block.entity.base.ExtendedBlockEntity;
 import com.github.mixinors.astromine.common.screen.handler.base.block.BlockStateScreenHandler;
+import com.github.mixinors.astromine.common.screen.handler.base.entity.ExtendedEntityScreenHandler;
 import com.github.mixinors.astromine.common.transfer.StorageSiding;
 import com.github.mixinors.astromine.common.transfer.StorageType;
 import com.github.mixinors.astromine.common.util.WidgetUtils;
@@ -46,6 +47,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.screen.slot.SlotActionType;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -116,6 +118,16 @@ public ExtendedBlockEntityScreenHandler(Supplier<? extends ScreenHandlerType<?>>
 			BlockEntityHooks.syncData(blockEntity);
 		}
 	}
+
+	public static void onServerPre(MinecraftServer server) {
+		for (var playerEntity : server.getPlayerManager().getPlayerList()) {
+			if (playerEntity.currentScreenHandler instanceof ExtendedBlockEntityScreenHandler screenHandler) {
+				if (screenHandler.getBlockEntity() != null) {
+					screenHandler.getBlockEntity().syncData();
+				}
+			}
+		}
+	}
 
 	public ExtendedBlockEntity getBlockEntity() {
 		return blockEntity;

src/main/java/com/github/mixinors/astromine/common/screen/handler/base/entity/ExtendedEntityScreenHandler.java

@@ -40,6 +40,7 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.ScreenHandlerType;
+import net.minecraft.server.MinecraftServer;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -100,6 +101,16 @@ public ExtendedEntityScreenHandler(Supplier<? extends ScreenHandlerType<?>> type
 			entity.setSyncFluidStorage(true);
 		}
 	}
+
+	public static void onServerPre(MinecraftServer server) {
+		for (var playerEntity : server.getPlayerManager().getPlayerList()) {
+			if (playerEntity.currentScreenHandler instanceof ExtendedEntityScreenHandler screenHandler) {
+				if (screenHandler.getEntity() != null) {
+					screenHandler.getEntity().syncData();
+				}
+			}
+		}
+	}
 
 	public abstract ItemStack getSymbol();