A

.github/workflows/build.yml

@@ -3,29 +3,28 @@ name: Universal Mod Core CI
 on: [push]
 
 jobs:
-    build:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - uses: actions/setup-java@v1
-              with:
-                java-version: '21' # The JDK version to make available on the path.
-                java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk
-                architecture: x64 # (x64 or x86) - defaults to x64
-            - run: |
-                ref=`echo ${github_ref} | sed -e 's,refs/heads/,,' | tr '/' '-'`
-                echo $ref
-                echo "::set-env name=ref::$ref"
-              env:
-                github_ref: ${{ github.ref }}
-                ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-            - name: keyscan
-              run: mkdir -p ~/.ssh/ && ssh-keyscan -t rsa teamopenindustry.cc >> ~/.ssh/known_hosts
-            - name: Gradle publish
-              env:
-                MAVENCI_PASS: ${{ secrets.MAVENCI_PASS }}
-              run: ./gradlew publish
-            - uses: actions/upload-artifact@v4
-              with:
-                name: UniversalModCore-${{ env.ref }}
-                path: build/libs/UniversalModCore-*.jar
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - run: |
+          ref=`echo ${github_ref} | sed -e 's,refs/heads/,,' | tr '/' '-'`
+          echo $ref
+          echo "::set-env name=ref::$ref"
+        env:
+          github_ref: ${{ github.ref }}
+          ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+      - name: keyscan
+        run: mkdir -p ~/.ssh/ && ssh-keyscan -t rsa teamopenindustry.cc >> ~/.ssh/known_hosts
+      - name: Gradle publish
+        env:
+          MAVENCI_PASS: ${{ secrets.MAVENCI_PASS }}
+        run: ./gradlew publish
+      - uses: actions/upload-artifact@v6
+        with:
+          name: UniversalModCore-${{ env.ref }}
+          path: build/libs/UniversalModCore-*.jar

.github/workflows/release.yml

@@ -3,34 +3,57 @@ name: Universal Mod Core Release
 on: [workflow_dispatch]
 
 jobs:
-    build:
-        runs-on: ubuntu-latest
-        strategy:
-          matrix:
-            branch: [1.7.10-forge, 1.10.2-forge, 1.11.2-forge, 1.12.2-forge, 1.14.4-forge, 1.15.2-forge, 1.16.5-forge]
-        steps:
-            - uses: actions/checkout@v4
-              with:
-                ref: ${{ matrix.branch }}
-            - uses: actions/setup-java@v1
-              with:
-                java-version: '1.8' # The JDK version to make available on the path.
-                java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk
-                architecture: x64 # (x64 or x86) - defaults to x64
-            - run: |
-                ref=`echo ${github_ref} | sed -e 's,refs/heads/,,' | tr '/' '-'`
-                echo $ref
-                echo "::set-env name=ref::$ref"
-              env:
-                github_ref: ${{ github.ref }}
-                ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-            - name: keyscan
-              run: mkdir -p ~/.ssh/ && ssh-keyscan -t rsa teamopenindustry.cc >> ~/.ssh/known_hosts
-            - name: Gradle publish
-              env:
-                MAVENCI_PASS: ${{ secrets.MAVENCI_PASS }}
-              run: ./gradlew publish -Dtarget=release
-            - uses: actions/upload-artifact@v4
-              with:
-                name: UniversalModCore-${{ env.ref }}
-                path: build/libs/UniversalModCore-*.jar
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - branch: 1.7.10-forge
+            java: 25 # RFG uses gradle 9
+          - branch: 1.10.2-forge
+            java: 8
+          - branch: 1.11.2-forge
+            java: 8
+          - branch: 1.12.2-forge
+            java: 8
+          - branch: 1.14.4-forge
+            java: 8
+          - branch: 1.15.2-forge
+            java: 8
+          - branch: 1.16.5-forge
+            java: 8
+          - branch: 1.17.1-forge
+            java: 16
+          - branch: 1.18.2-forge
+            java: 17
+          - branch: 1.19.4-forge
+            java: 17
+          - branch: 1.20.1-forge
+            java: 17
+          - branch: 1.21.1-neoforge
+            java: 21
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          ref: ${{ matrix.branch }}
+      - uses: actions/setup-java@v5
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'temurin'
+      - run: |
+          ref=`echo ${github_ref} | sed -e 's,refs/heads/,,' | tr '/' '-'`
+          echo $ref
+          echo "::set-env name=ref::$ref"
+        env:
+          github_ref: ${{ github.ref }}
+          ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+      - name: keyscan
+        run: mkdir -p ~/.ssh/ && ssh-keyscan -t rsa teamopenindustry.cc >> ~/.ssh/known_hosts
+      - name: Gradle publish
+        env:
+          MAVENCI_PASS: ${{ secrets.MAVENCI_PASS }}
+        run: ./gradlew publish -Dtarget=release
+      - uses: actions/upload-artifact@v6
+        with:
+          name: UniversalModCore-${{ env.ref }}
+          path: build/libs/UniversalModCore-*.jar

.gitignore

@@ -20,6 +20,7 @@ build
 # other
 eclipse
 runs
+logs
 
 # sketchup
 *.skb

build.gradle

@@ -17,7 +17,7 @@ repositories {
     }
 }
 
-String umcVersion = "1.3.0"
+String umcVersion = "1.3.1"
 if (!"release".equalsIgnoreCase(System.getProperty("target"))) {
     try {
         umcVersion += "-${(providers.exec { commandLine("git", "rev-parse", "--verify", "--short=7", "HEAD") }.standardOutput.asText.get() as String).substring(0, 7)}"
@@ -116,7 +116,7 @@ dependencies {
     // or you may define them like so..
     //compile "some.group:artifact:version:classifier"
     //compile "some.group:artifact:version"
-      
+
     // real examples
     //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
     //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip

src/main/java/cam72cam/mod/ModCore.java

@@ -63,7 +63,7 @@
 public class ModCore {
     public static final String MODID = "universalmodcore";
     public static final String NAME = "UniversalModCore";
-    public static final String VERSION = "1.3.0";
+    public static final String VERSION = "1.3.1";
     public static ModCore instance;
     public static boolean hasResources;
     private static boolean isInReload;

src/main/java/cam72cam/mod/entity/EntityRegistry.java

@@ -20,6 +20,8 @@
 import net.minecraftforge.api.distmarker.OnlyIn;
 import org.apache.commons.lang3.tuple.Pair;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Supplier;
@@ -100,7 +102,11 @@ public static void registerClientEvents() {
             if (w.isClientSide) {
                 // Cleanup client side since mc does not call setDead client side...
                 // See ClientEvents registration for related crap
-                for (net.minecraft.world.entity.Entity entity : ((ClientLevel) w).entitiesForRendering()) {
+                Iterable<net.minecraft.world.entity.Entity> iter = ((ClientLevel) w).entitiesForRendering();
+                if (iter instanceof Collection<net.minecraft.world.entity.Entity> e) {
+                    iter = new ArrayList<>(e);
+                }
+                for (net.minecraft.world.entity.Entity entity : iter) {
                     if (entity instanceof ModdedEntity) {
                         entity.remove(net.minecraft.world.entity.Entity.RemovalReason.DISCARDED);
                     }

src/main/java/cam72cam/mod/entity/ModdedEntity.java

@@ -10,6 +10,7 @@
 import cam72cam.mod.serialization.*;
 import cam72cam.mod.util.SingleCache;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.game.ClientGamePacketListener;
 import net.minecraft.network.syncher.EntityDataAccessor;
@@ -120,6 +121,7 @@ private void load(TagCompound data) {
         } catch (SerializationException e) {
             ModCore.catching(e, "Error during entity load: %s - %s", this, data);
         }
+        applySavedVelocity(data);
 
         if (!this.level().isClientSide()) {
             getEntityData().set(ROLL, this.roll);
@@ -574,6 +576,14 @@ public void setDeltaMovement(double x, double y, double z) {
         }
     }
 
+    private void applySavedVelocity(TagCompound data) {
+        ListTag vel = data.internal.getList("Motion", 6);
+        double x = vel.getDouble(0);
+        double y = vel.getDouble(1);
+        double z = vel.getDouble(2);
+        super.setDeltaMovement(x, y, z);
+    }
+
     /*
     @Override
     public String getName() {

src/main/java/cam72cam/mod/item/Fuzzy.java

@@ -6,8 +6,11 @@
 import net.minecraft.core.HolderSet;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
+import cam72cam.mod.util.RegistryUtil;
 import net.minecraft.resources.ResourceLocation;
 import cam72cam.mod.resource.BuiltinPack;
+import cam72cam.mod.resource.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.level.block.Block;
@@ -101,8 +104,8 @@ public class Fuzzy {
                 "  \"values\": []\n" +
                 "}").getBytes(StandardCharsets.UTF_8);
         BuiltinPack.addNamespace("c");
-        BuiltinPack.putData(ResourceLocation.parse("c:tags/items/ingots/steel.json"), data);
-        BuiltinPack.putData(ResourceLocation.parse("c:tags/items/storage_blocks/steel.json"), data);
+        BuiltinPack.putData(new Identifier("c:tags/items/ingots/steel.json"), data);
+        BuiltinPack.putData(new Identifier("c:tags/items/storage_blocks/steel.json"), data);
     }
 
     static Map<String, Fuzzy> registered;

src/main/java/cam72cam/mod/render/ItemRender.java

@@ -4,19 +4,18 @@
 import cam72cam.mod.MinecraftClient;
 import cam72cam.mod.ModCore;
 import cam72cam.mod.event.ClientEvents;
+import cam72cam.mod.event.CommonEvents;
 import cam72cam.mod.gui.Progress;
 import cam72cam.mod.item.CustomItem;
 import cam72cam.mod.item.ItemStack;
 import cam72cam.mod.render.opengl.RenderContext;
 import cam72cam.mod.render.opengl.RenderState;
+import cam72cam.mod.resource.BuiltinPack;
 import cam72cam.mod.resource.Identifier;
 import cam72cam.mod.util.With;
 import cam72cam.mod.world.World;
-import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.pipeline.TextureTarget;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Transformation;
-import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
@@ -28,14 +27,11 @@
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.model.*;
 import net.minecraft.core.Direction;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.inventory.InventoryMenu;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.client.model.ItemLayerModel;
-import net.minecraftforge.client.model.SimpleModelState;
+import net.minecraftforge.client.model.*;
 import net.minecraftforge.client.model.geometry.IGeometryBakingContext;
 import org.apache.commons.lang3.tuple.Pair;
 import org.lwjgl.BufferUtils;
@@ -46,21 +42,25 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
 import java.util.function.BiConsumer;
-import java.util.stream.Collectors;
 
 /** Item Render Registry (Here be dragons...) */
 public class ItemRender {
     private static final List<BakedQuad> EMPTY = Collections.emptyList();
     private static final SpriteSheet iconSheet = new SpriteSheet(Config.SpriteSize);
 
-    private static final Executor POOL = Executors.newFixedThreadPool(1);
+    //String template for simple item models
+    private static final String modelTemplate = "models/item/%s.json";
+    private static final String jsonTemplate = """
+            {
+                "parent": "minecraft:item/generated",
+                "textures": {
+                    "layer0": "%s"
+                }
+            }""";
 
     /** Register a simple image for an item */
     public static void register(CustomItem item, Identifier tex) {
@@ -130,8 +130,7 @@ public boolean isComponentVisible(String s, boolean b) {
             }, foo, ItemOverrides.EMPTY/*, tex.internal*/));
         });
 
-        ClientEvents.TEXTURE_STITCH.subscribe(list -> list.addSprite(tex.internal));
-        ClientEvents.MODEL_CREATE.subscribe(() -> Minecraft.getInstance().getItemRenderer().getItemModelShaper().register(item.internal, new ModelResourceLocation(item.getRegistryName().internal, "")));
+        ClientEvents.TEXTURE_STITCH.subscribe(evt -> evt.addSprite(tex.internal));
     }
 
     /** Register a complex model for an item */