❤️‍🔥 Version 1.20.1-42.1.1

Jeryn99 · Jan 27, 2025 · 88fff08 · 88fff08
1 parent 1dff84b
commit 88fff08
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/changelog.html b/changelog.html
@@ -1,5 +1,3 @@
-<b> ❤️‍🔥 Version 1.20.1-42.1.0 </b></br>
+<b> ❤️‍🔥 Version 1.20.1-42.1.1 </b></br>
 <b>Changes:</b><br>
-- Fixed Mojang skin slim issue
-- Fixed Second layer shows with Better Combat mod
-- Fixes skin defaulting to orignal when loading into new dimensions
+- Fixed Skin API being outdated and providing horrible skins
diff --git a/common/src/main/java/mc/craig/software/regen/client/rendering/layers/RenderRegenLayer.java b/common/src/main/java/mc/craig/software/regen/client/rendering/layers/RenderRegenLayer.java
@@ -29,8 +29,9 @@ public static void renderColorCone(PoseStack poseStack, VertexConsumer vertexBui
             for (int i = 0; i < 10; i++) {
                 poseStack.mulPose(Axis.YP.rotation(entityPlayer.tickCount * 4 + i * 45));
                 poseStack.scale(1.0f, 1.0f, 0.65f);
-                float alpha = Mth.clamp(Mth.sin((entityPlayer.tickCount + Minecraft.getInstance().getFrameTime()) / 5) * 0.1F + 0.1F, 0.11F, 1F);
+                //float alpha = Mth.clamp(Mth.sin((entityPlayer.tickCount + Minecraft.getInstance().getFrameTime()) / 5) * 0.1F + 0.1F, 0.11F, 1F);
                 float red = (float) color.x, green = (float) color.y, blue = (float) color.z;
+                float alpha = 1;
                 vertexBuilder.vertex(poseStack.last().pose(), 0.0F, 0.0F, 0.0F).color(red, green, blue, alpha).uv2(combinedLightIn).endVertex();
                 vertexBuilder.vertex(poseStack.last().pose(), -0.266F * scale, scale, -0.5F * scale).color(red, green, blue, alpha).uv2(combinedLightIn).endVertex();
                 vertexBuilder.vertex(poseStack.last().pose(), 0.266F * scale, scale, -0.5F * scale).color(red, green, blue, alpha).uv2(combinedLightIn).endVertex();

diff --git a/common/src/main/java/mc/craig/software/regen/client/rendering/types/RenderTypes.java b/common/src/main/java/mc/craig/software/regen/client/rendering/types/RenderTypes.java
@@ -13,7 +13,9 @@
 public class RenderTypes extends RenderType {
 
 
-    public static final RenderType REGEN_FLAMES = RenderTypes.lightning();
+    public static final RenderType REGEN_FLAMES = RenderType.create("dragon_rays", DefaultVertexFormat.POSITION_COLOR, VertexFormat.Mode.TRIANGLES, 1536, false, false, CompositeState.builder().setShaderState(RENDERTYPE_LIGHTNING_SHADER).setWriteMaskState(COLOR_WRITE).setTransparencyState(LIGHTNING_TRANSPARENCY).createCompositeState(false));
+
+
     public static final RenderType LASER = create(RConstants.MODID + ":laser", DefaultVertexFormat.POSITION_COLOR_LIGHTMAP, VertexFormat.Mode.QUADS, 256, false, true, RenderType.CompositeState.builder()
             .setShaderState(RENDERTYPE_LIGHTNING_SHADER)
             .setTextureState(NO_TEXTURE)

diff --git a/common/src/main/java/mc/craig/software/regen/client/skin/SkinRetriever.java b/common/src/main/java/mc/craig/software/regen/client/skin/SkinRetriever.java
@@ -130,7 +130,7 @@ public static void remoteSkins() throws IOException {
             String link = skin.getAsJsonObject().get("link").getAsString();
             String id = skin.getAsJsonObject().get("name").getAsString();
             // Download the skin from the given link and save it to the specified directories
-            downloadSkins(new URL(link), "web_" + id, SKINS_DIR_SLIM_TRENDING, SKINS_DIR_DEFAULT_TRENDING);
+            downloadSkins(new URL(link), "web_" + id.replace("Skin_", ""), SKINS_DIR_SLIM_TRENDING, SKINS_DIR_DEFAULT_TRENDING);
         }
     }
 
@@ -174,12 +174,12 @@ public static void downloadSkins(URL url, String filename, File alexDir, File st
     public static void internalSkins() throws IOException {
         //if(!RegenConfig.CLIENT.downloadInteralSkins.get()) return;
         Regeneration.LOGGER.warn("Re-downloading internal skins");
-        String packsUrl = "https://mc-api.craig.software/skins";
+        String packsUrl = "https://api.jeryn.dev/mc/skins/random";
         JsonElement links = SkinApi.getApiData(packsUrl);
 
         // Check if the links element is a JSON object
         if (links.isJsonObject()) {
-            JsonArray data = links.getAsJsonObject().getAsJsonArray("data");
+            JsonArray data = links.getAsJsonArray();
             for (JsonElement jsonElement : data) {
                 JsonObject currentSkin = jsonElement.getAsJsonObject();
 

diff --git a/common/src/main/java/mc/craig/software/regen/util/SkinApi.java b/common/src/main/java/mc/craig/software/regen/util/SkinApi.java
@@ -19,7 +19,7 @@ public class SkinApi {
 
     private static final String USER_AGENT = "Regeneration MC Mod/1.0";
     private static final String URL = "https://api.mineskin.org";
-    private static final String API_ENDPOINT = "https://mc.craig.software/api/skin/random-skins";
+    private static final String API_ENDPOINT = "https://api.jeryn.dev/mc/skins/random";
 
     /**
      * Retrieves a list of skin URLs from a given page number.

diff --git a/common/src/main/resources/data/regen/worldgen/structure_set/timelord_settlement.json b/common/src/main/resources/data/regen/worldgen/structure_set/timelord_settlement.json
@@ -2,13 +2,13 @@
   "structures": [
     {
       "structure": "regen:timelord_settlement",
-      "weight": 1
+      "weight": 3
     }
   ],
   "placement": {
     "salt": 1234353780,
-    "spacing": 2600,
-    "separation": 2578,
+    "spacing": 1200,
+    "separation": 1078,
     "type": "minecraft:random_spread"
   }
 }
diff --git a/forge/src/generated/resources/regen/.cache/0e4577e26c99287dab134ceb06ffbaf155ee0b76 b/forge/src/generated/resources/regen/.cache/0e4577e26c99287dab134ceb06ffbaf155ee0b76
@@ -1,3 +1,3 @@
-// 1.20.1	2024-12-25T20:54:23.0734188	Tags for minecraft:worldgen/biome mod id regen
+// 1.20.1	2025-01-27T08:42:34.7324056	Tags for minecraft:worldgen/biome mod id regen
 0dbc9816cff0a2df18f6d21455724c530e1bf58d data/regen/tags/worldgen/biome/has_structure/timelord_settlement.json
-9d21a837a31dc7f53628eff549108b90786e78ce data/regen/tags/worldgen/biome/overworld_ore.json
+b020f6cdcd2d955793278b2f89a178a1d31e599a data/regen/tags/worldgen/biome/overworld_ore.json
diff --git a/forge/src/generated/resources/regen/data/regen/tags/worldgen/biome/overworld_ore.json b/forge/src/generated/resources/regen/data/regen/tags/worldgen/biome/overworld_ore.json
@@ -1,6 +1,5 @@
 {
   "values": [
-    "#minecraft:is_overworld",
-    "#forge:is_underground"
+    "#minecraft:is_overworld"
   ]
 }
diff --git a/forge/src/main/java/mc/craig/software/regen/forge/data/RegenBiomeTags.java b/forge/src/main/java/mc/craig/software/regen/forge/data/RegenBiomeTags.java
@@ -19,7 +19,7 @@ public RegenBiomeTags(PackOutput arg, CompletableFuture<HolderLookup.Provider> c
 
     @Override
     protected void addTags(HolderLookup.Provider provider) {
-        this.tag(RegenUtil.IS_OVERWORLD).addTags(BiomeTags.IS_OVERWORLD, Tags.Biomes.IS_UNDERGROUND);
+        this.tag(RegenUtil.IS_OVERWORLD).addTags(BiomeTags.IS_OVERWORLD);
         this.tag(RegenUtil.TIMELORD_SETTLEMENT).addTags(BiomeTags.IS_FOREST, BiomeTags.HAS_WOODLAND_MANSION, BiomeTags.IS_TAIGA, BiomeTags.IS_HILL);
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ minecraft_version=1.20.1
 enabled_platforms=fabric,forge
 
 archives_base_name=regeneration
-mod_version=42.1.0
+mod_version=42.1.1
 maven_group=mc.craig.software.regen
 
 architectury_version=9.1.12