2.2.3

terrarium-earth · Dec 3, 2022 · 3aacc3d · 3aacc3d
1 parent 2d1ea4d
commit 3aacc3d
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 39 deletions.
diff --git a/build.gradle b/build.gradle
@@ -59,15 +59,15 @@ tasks.register("generateDiscordEmbed") {
                 title: archives_base_name,
                 color: Integer.parseInt(env.EMBED_COLOR, 16),
                 fields: fields,
-                thumbnail: [url: env.WEBHOOK_THUMBNAIL]
+                thumbnail: [url: env.WEBHOOK_THUMBNAIL],
+                footer: [
+                        text: "Want to support us? Check out our Ko-fi! http://kofi.terrarium.earth",
+                        icon_url: "https://cdn.discordapp.com/attachments/881367981463072809/1044025688719626250/61e1116779fc0a9bd5bdbcc7_Frame_6.png"
+                ]
             ]],
             username: env.WEBHOOK_USERNAME,
             avatar_url: env.WEBHOOK_AVATAR,
-            attatchments: [],
-            footer: [
-                    text: "Want to support us? Check out our Ko-fi! http://kofi.terrarium.earth",
-                    icon_url: "https://cdn.discordapp.com/attachments/881367981463072809/1044025688719626250/61e1116779fc0a9bd5bdbcc7_Frame_6.png"
-            ]
+            attatchments: []
         ])
 
         new File(projectDir, "embed.json").write(json)

diff --git a/changelog.txt b/changelog.txt
@@ -1,2 +1,2 @@
-Spirit 2.2.2
-Added zooming pinch and drag to REI/JEI
+> Fix keybind issue
+> Fixed broken loot tables
diff --git a/common/src/main/java/me/codexadrian/spirit/network/messages/ToggleEmpoweredPacket.java b/common/src/main/java/me/codexadrian/spirit/network/messages/ToggleEmpoweredPacket.java
@@ -16,7 +16,7 @@
 
 public record ToggleEmpoweredPacket() implements IPacket<ToggleEmpoweredPacket> {
     public static Handler HANDLER = new Handler();
-    public static final ResourceLocation ID = new ResourceLocation(Spirit.MODID, "timedoor");
+    public static final ResourceLocation ID = new ResourceLocation(Spirit.MODID, "empower");
 
     @Override
     public ResourceLocation getID() {

diff --git a/common/src/main/resources/data/spirit/loot_tables/blocks/compressed_soul_powder_block.json b/common/src/main/resources/data/spirit/loot_tables/blocks/compressed_soul_powder_block.json
@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "spirit:compressed_soul_powder_block"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}
diff --git a/common/src/main/resources/data/spirit/loot_tables/blocks/compressed_soul_sand.json b/common/src/main/resources/data/spirit/loot_tables/blocks/compressed_soul_sand.json
@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "spirit:compressed_soul_sand"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}
diff --git a/forge/src/main/java/me/codexadrian/spirit/forge/ForgeSpirit.java b/forge/src/main/java/me/codexadrian/spirit/forge/ForgeSpirit.java
@@ -5,8 +5,11 @@
 import me.codexadrian.spirit.entity.CrudeSoulEntity;
 import me.codexadrian.spirit.platform.forge.ForgeRegistryHelper;
 import me.codexadrian.spirit.registry.SpiritMisc;
+import net.minecraft.client.Minecraft;
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.event.entity.EntityAttributeCreationEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.InterModComms;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.ModLoadingContext;
@@ -31,6 +34,8 @@ public ForgeSpirit() {
         ForgeRegistryHelper.RECIPE_SERIALIZERS.register(eventBus);
         eventBus.addListener(this::entityAttributeStuff);
         eventBus.addListener(this::imcEvent);
+
+        DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> eventBus.addListener(KeybindHandler::registerKeyBinding));
     }
 
     private void imcEvent(InterModEnqueueEvent event) {

diff --git a/forge/src/main/java/me/codexadrian/spirit/forge/ForgeSpiritClient.java b/forge/src/main/java/me/codexadrian/spirit/forge/ForgeSpiritClient.java
@@ -1,51 +1,30 @@
 package me.codexadrian.spirit.forge;
 
-import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import me.codexadrian.spirit.SpiritClient;
 import me.codexadrian.spirit.client.CrudeSoulEntityModel;
-import me.codexadrian.spirit.network.NetworkHandler;
-import me.codexadrian.spirit.network.messages.ToggleEmpoweredPacket;
-import net.minecraft.client.KeyMapping;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.ShaderInstance;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.event.EntityRenderersEvent;
-import net.minecraftforge.client.event.InputEvent;
-import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
 import net.minecraftforge.client.event.RegisterShadersEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-import org.lwjgl.glfw.GLFW;
 
 import java.io.IOException;
 
 @OnlyIn(Dist.CLIENT)
 @Mod.EventBusSubscriber(modid = "spirit", bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
 public class ForgeSpiritClient {
 
-    public ForgeSpiritClient() {
-        MinecraftForge.EVENT_BUS.addListener(this::keybindAction);
-    }
-
-    private static final KeyMapping EMPOWER_KEYBIND = new KeyMapping(
-            "key.spirit.toggle", // The translation key of the keybinding's name
-            InputConstants.Type.KEYSYM, // The type of the keybinding, KEYSYM for keyboard, MOUSE for mouse.
-            GLFW.GLFW_KEY_V, // The keycode of the key
-            "category.spirit.keybinds" // The translation key of the keybinding's category.
-    );
-
     @SubscribeEvent
     public static void onInitializeClient(FMLClientSetupEvent event) {
         SpiritClient.initClient();
-    }
-
-    @SubscribeEvent
-    public static void registerKeyBinding(RegisterKeyMappingsEvent event) {
-        event.register(EMPOWER_KEYBIND);
+        MinecraftForge.EVENT_BUS.register(new KeybindHandler());
     }
 
     @SubscribeEvent
@@ -61,10 +40,4 @@ public static void onShadersRegistered(RegisterShadersEvent event) throws IOExce
     public static void addLayers(EntityRenderersEvent.RegisterLayerDefinitions event) {
         event.registerLayerDefinition(CrudeSoulEntityModel.LAYER_LOCATION, CrudeSoulEntityModel::createBodyLayer);
     }
-
-    public void keybindAction(InputEvent.Key event) {
-        while (event.getKey() == EMPOWER_KEYBIND.getKey().getValue()) {
-            NetworkHandler.sendToServer(new ToggleEmpoweredPacket());
-        }
-    }
 }
diff --git a/forge/src/main/java/me/codexadrian/spirit/forge/KeybindHandler.java b/forge/src/main/java/me/codexadrian/spirit/forge/KeybindHandler.java
@@ -0,0 +1,33 @@
+package me.codexadrian.spirit.forge;
+
+import com.mojang.blaze3d.platform.InputConstants;
+import me.codexadrian.spirit.network.NetworkHandler;
+import me.codexadrian.spirit.network.messages.ToggleEmpoweredPacket;
+import net.minecraft.client.KeyMapping;
+import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
+import net.minecraftforge.event.TickEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import org.lwjgl.glfw.GLFW;
+
+public class KeybindHandler {
+
+    private static final KeyMapping EMPOWER_KEYBIND = new KeyMapping(
+            "key.spirit.toggle", // The translation key of the keybinding's name
+            InputConstants.Type.KEYSYM, // The type of the keybinding, KEYSYM for keyboard, MOUSE for mouse.
+            GLFW.GLFW_KEY_V, // The keycode of the key
+            "category.spirit.keybinds" // The translation key of the keybinding's category.
+    );
+
+    public static void registerKeyBinding(RegisterKeyMappingsEvent event) {
+        event.register(EMPOWER_KEYBIND);
+    }
+
+    @SubscribeEvent
+    public void onClientTick(TickEvent.ClientTickEvent event) {
+        if (event.phase == TickEvent.Phase.END) { // Only call code once as the tick event is called twice every tick
+            while (EMPOWER_KEYBIND.consumeClick()) {
+                NetworkHandler.sendToServer(new ToggleEmpoweredPacket());
+            }
+        }
+    }
+}
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ platforms=fabric,forge
 
 archives_base_name=Spirit
 mod_id=spirit
-mod_version=2.2.2
+mod_version=2.2.3
 maven_group=me.codexadrian.spirit
 
 jei_version=11.3.0.262