1.16 last fix

Author: MORIMORI0317

.github/workflows/builder.yml

@@ -19,9 +19,11 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew build curseforge
+      run: ./gradlew build publish
       env:
         curesforgeapikey: ${{secrets.CURESFORGEAPIKEY}}
+        mavenname: ${{secrets.MAVEN_NAME}}
+        mavenpassword: ${{secrets.MAVEN_PASSWORD}}
     - name: Zip create
       run: |
        cd build/libs

build.gradle

@@ -9,17 +9,16 @@ buildscript {
     }
 }
 plugins {
-    id 'com.matthewprenger.cursegradle' version '1.4.0'
     id "com.github.johnrengelman.shadow" version "4.0.4"
 }
 apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-if (System.getenv('curesforgeapikey') == null || "${curesfg_id}" == "0")
-    version = "${mod_version}-pre${getDate()}"
-else
-    version = "${mod_version}"
+//if (System.getenv('curesforgeapikey') == null || "${curesfg_id}" == "0")
+//    version = "${mod_version}-pre${getDate()}"
+//else
+version = "${mod_version}"
 
 group = "${mod_group}"
 archivesBaseName = "${mod_name}-${mc_version}"
@@ -86,14 +85,16 @@ dependencies {
     compileOnly fg.deobf("mezz.jei:jei-${jei_version}:api")
     runtimeOnly fg.deobf("mezz.jei:jei-${jei_version}")
     compile fg.deobf("com.feed_the_beast.mods:ftb-gui-library:${fgl_version}")
-    shadow 'dev.felnull:felnull-java-library:1.2'
+    shadow 'dev.felnull:felnull-java-library:1.5'
+    shadow 'com.madgag:animated-gif-lib:1.4'
 }
 
 shadowJar {
     classifier ''
     project.configurations.shadow.setTransitive(true);
     configurations = [project.configurations.shadow]
-    relocate 'dev', 'red.felnull.otyacraftengine.libs.dev'
+    relocate 'dev.felnull.fnjl', 'red.felnull.otyacraftengine.libs.dev.felnull.fnjl'
+    relocate 'com.madgag.gif', 'red.felnull.otyacraftengine.libs.com.madgag.gif'
 }
 
 tasks.withType(AbstractCompile)*.options*.encoding = tasks.withType(GroovyCompile)*.groovyOptions*.encoding = 'UTF-8'
@@ -108,9 +109,6 @@ ext.themanifest = {
             "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
     ])
 }
-jar {
-    manifest themanifest
-}
 jar.finalizedBy('reobfJar')
 task devJar(type: Jar) {
     from sourceSets.main.output
@@ -134,33 +132,37 @@ afterEvaluate {
 publishing {
     publications {
         mavenJava(MavenPublication) {
+            artifactId = 'otyacraftengine'
             artifact jar
-            artifact devJar
-            artifact sourceJar
+            pom {
+                name = 'OtyacraftEngine'
+                description = 'My mod integration library.'
+                licenses {
+                    license {
+                        name = 'GNU Lesser General Public License v3.0'
+                        url = 'https://www.gnu.org/licenses/lgpl-3.0.txt'
+                    }
+                }
+                developers {
+                    developer {
+                        id = 'MORIMORI0317'
+                        name = 'MORIMORI0317'
+                    }
+                    developer {
+                        id = 'FelNull'
+                        name = 'TeamFelNull'
+                        email = 'teamfelnull@m.servg.red'
+                    }
+                }
+            }
         }
     }
     repositories {
         maven {
-            url "file:///${project.projectDir}/mcmodsrepo"
-        }
-    }
-}
-if (System.getenv('curesforgeapikey') != null && "${curesfg_id}" != "0") {
-    curseforge {
-        apiKey = System.getenv('curesforgeapikey')
-        project {
-            id = "${curesfg_id}"
-            changelog = ""
-            releaseType = "${releasetype}"
-            addGameVersion "${mc_version}"
-            mainArtifact(jar) {
-                displayName = "${mod_name}-${mc_version}-${mod_version}"
-            }
-            addArtifact(devJar) {
-                displayName = "${mod_name}-${mc_version}-${mod_version}-dev"
-            }
-            addArtifact(sourceJar) {
-                displayName = "${mod_name}-${mc_version}-${mod_version}-source"
+            url "https://maven.morimori0317.net/"
+            credentials {
+                username = System.getenv('mavenname')
+                password = System.getenv('mavenpassword')
             }
         }
     }

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.daemon=false
 forge_mapping=20201028-1.16.3
 forge_version=36.2.8
 mod_name=OtyacraftEngine
-mod_group=red.felnull.otyacraftengine
+mod_group=red.felnull
 mod_version=1.23
 mod_vendor=TeamFelNull
 mc_version=1.16.5

src/main/java/red/felnull/otyacraftengine/block/TestBlock.java

@@ -1,23 +1,6 @@
 package red.felnull.otyacraftengine.block;
 
-import net.minecraft.block.AbstractBlock;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.material.Material;
-import net.minecraft.item.BlockItem;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemGroup;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.shapes.ISelectionContext;
-import net.minecraft.util.math.shapes.VoxelShape;
-import net.minecraft.util.math.shapes.VoxelShapes;
-import net.minecraft.world.IBlockReader;
-import net.minecraftforge.event.RegistryEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import red.felnull.otyacraftengine.OtyacraftEngine;
-import red.felnull.otyacraftengine.util.IKSGVoxelShapeUtil;
-
+/*
 //@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD)
 public class TestBlock extends Block {
     public static final Block TEST = new TestBlock(AbstractBlock.Properties.create(Material.ANVIL).hardnessAndResistance(1f, 1f)).setRegistryName(new ResourceLocation(OtyacraftEngine.MODID, "test_block"));
@@ -51,4 +34,4 @@ public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos,
         VoxelShape test = X_AXIS_AABB;
         return IKSGVoxelShapeUtil.rotate90(test);
     }
-}
+}*/

src/main/java/red/felnull/otyacraftengine/client/config/ClientConfig.java

@@ -25,8 +25,8 @@ static class ConfigLoder {
         public ConfigLoder(ForgeConfigSpec.Builder builder) {
             OtyacraftEngine.LOGGER.info("Loading Client Config");
             builder.push("ToolTip");
-            ToolTipModName = builder.define("Show ModName", true);
-            ToolTipTag = builder.define("Show Tag", true);
+            ToolTipModName = builder.define("Show ModName", false);
+            ToolTipTag = builder.define("Show Tag", false);
             ToolTipTagKey = builder.define("Show Tag Key", "key.sprint");
             ToolTipDetailedInformation = builder.define("Show DetailedInformation", true);
             ToolTipDetailedInformationKey = builder.define("Show DetailedInformation Key", "key.sneak");

src/main/java/red/felnull/otyacraftengine/client/data/URLImageTextureLoder.java

@@ -2,9 +2,10 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.stream.JsonReader;
+import dev.felnull.fnjl.util.FNDataUtil;
+import dev.felnull.fnjl.util.FNURLUtil;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
@@ -14,10 +15,9 @@
 import red.felnull.otyacraftengine.util.IKSGPathUtil;
 import red.felnull.otyacraftengine.util.IKSGPictuerUtil;
 
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.URL;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
 
@@ -166,12 +166,11 @@ public void run() {
             String name = UUID.randomUUID().toString();
             Path texPath = CASH_PATH.resolve("cash").resolve(name);
             try {
-                URL imageURL = new URL(urldata.getURL());
-                BufferedImage image = ImageIO.read(imageURL);
+                byte[] data = FNDataUtil.streamToByteArray(FNURLUtil.getStream(new URL(urldata.getURL())));
                 if (urldata.isDecidedSuze())
-                    image = IKSGPictuerUtil.resize(image, urldata.getWidth(), urldata.getHeight());
+                    data = IKSGPictuerUtil.resize(data, urldata.getWidth(), urldata.getHeight());
                 IKSGFileLoadUtil.createFolder(texPath.getParent());
-                ImageIO.write(image, "png", texPath.toFile());
+                Files.write(texPath, data);
             } catch (Exception e) {
                 e.printStackTrace();
                 URLImageTextureLoder.instance().PICTUER_URL_LOCATION.put(urldata, IKSGTextureUtil.TEXTUER_NOTFINED);

src/main/java/red/felnull/otyacraftengine/client/gui/screen/TestScreen.java

@@ -4,6 +4,7 @@
 import net.minecraft.util.text.StringTextComponent;
 import red.felnull.otyacraftengine.client.gui.widget.FileChooserWidget;
 import red.felnull.otyacraftengine.client.util.IKSGRenderUtil;
+import red.felnull.otyacraftengine.client.util.IKSGTextureUtil;
 
 public class TestScreen extends IkisugiScreen {
 
@@ -26,6 +27,8 @@ public void tickByIKSG() {
     public void renderByIKSG(MatrixStack matrix, int mouseX, int mouseY, float parTick) {
         renderBackgroundByIKSG(matrix);
         super.renderByIKSG(matrix, mouseX, mouseY, parTick);
-        IKSGRenderUtil.drawPlayerFaseByUUID(matrix, "0f286fc2-0c86-42d5-8518-c306cad74f03", 0, 0);
+        //  IKSGRenderUtil.guiBindAndBlit(IKSGTextureUtil.getPictureImageURLTexture("https://cdn.discordapp.com/attachments/887769442019323924/888494682492010519/gabaana_dadhi.png"), matrix, 0, 0, 100, 100, 100, 100);
+
+        IKSGRenderUtil.guiBindAndBlit(IKSGTextureUtil.getPictureImageURLTexture("https://cdn.discordapp.com/attachments/887769442019323924/893111745927856128/broken.gif"), matrix, 0, 0, 100, 100, 100, 100);
     }
 }

src/main/java/red/felnull/otyacraftengine/client/handler/ClientHandler.java

@@ -6,7 +6,6 @@
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.text.TranslationTextComponent;
-import net.minecraftforge.client.event.InputEvent;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import net.minecraftforge.event.world.WorldEvent;
@@ -21,8 +20,6 @@
 import red.felnull.otyacraftengine.client.data.ReceiveTextureLoder;
 import red.felnull.otyacraftengine.client.data.URLImageTextureLoder;
 import red.felnull.otyacraftengine.client.gui.screen.IInstructionContainerScreen;
-import red.felnull.otyacraftengine.client.gui.screen.TestScreen;
-import red.felnull.otyacraftengine.client.keys.OEKeyBindings;
 import red.felnull.otyacraftengine.client.util.IKSGClientUtil;
 import red.felnull.otyacraftengine.client.util.IKSGTextureUtil;
 import red.felnull.otyacraftengine.data.WorldDataManager;

src/main/java/red/felnull/otyacraftengine/client/keys/OEKeyBindings.java

@@ -6,11 +6,11 @@
 import red.felnull.otyacraftengine.OtyacraftEngine;
 
 public class OEKeyBindings {
-    public static KeyBinding TEST = createKeyBind("test", GLFW.GLFW_KEY_M);
+    //public static KeyBinding TEST = createKeyBind("test", GLFW.GLFW_KEY_M);
     public static KeyBinding IN_GAME_FILE_MANAGER = createKeyBind("in_game_file_manager", GLFW.GLFW_KEY_O);
 
     public static void init() {
-        registerKey(TEST);
+   //     registerKey(TEST);
         //   registerKey(IN_GAME_FILE_MANAGER);
     }
 

src/main/java/red/felnull/otyacraftengine/client/renderer/texture/DynamicGifTexture.java

@@ -0,0 +1,66 @@
+package red.felnull.otyacraftengine.client.renderer.texture;
+
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.client.renderer.texture.ITickable;
+import net.minecraft.client.renderer.texture.NativeImage;
+
+public class DynamicGifTexture extends DynamicTexture implements ITickable {
+    private final ImageFrame[] frames;
+    private final long duration;
+    private int last;
+
+    public DynamicGifTexture(long duration, ImageFrame... frames) {
+        super(frames[0].getImage());
+        this.duration = duration;
+        this.frames = frames;
+    }
+
+    @Override
+    public void tick() {
+        int ct = Math.toIntExact(getFrameByTime(System.currentTimeMillis() % duration));
+        if (ct != last) {
+            this.dynamicTextureData = frames[ct].getImage();
+            updateDynamicTexture();
+            last = ct;
+        }
+    }
+
+    @Override
+    public void close() {
+        super.close();
+        if (frames != null) {
+            for (ImageFrame image : frames) {
+                if (image != null)
+                    image.getImage().close();
+            }
+        }
+    }
+
+    private int getFrameByTime(long time) {
+        long dr = 0;
+        for (int i = 0; i < frames.length; i++) {
+            if (dr <= time && dr + frames[i].delay > time)
+                return i;
+            dr += frames[i].delay;
+        }
+        return 0;
+    }
+
+    public static class ImageFrame {
+        private final NativeImage image;
+        private final long delay;
+
+        public ImageFrame(NativeImage image, long delay) {
+            this.image = image;
+            this.delay = delay;
+        }
+
+        public long getDelay() {
+            return delay;
+        }
+
+        public NativeImage getImage() {
+            return image;
+        }
+    }
+}