Merge pull request #8 from KELETU66666/master

New dimensional ripper texture(s)
Elite-Modding-Team · Sep 6, 2024 · a2b4e6c · a2b4e6c
2 parents d8c5a91 + 9743de1
commit a2b4e6c
Show file tree

Hide file tree

Showing 7 changed files with 808 additions and 284 deletions.
diff --git a/.../java/com/verdantartifice/thaumicwonders/client/renderers/tile/TesrDimensionalRipper.java b/.../java/com/verdantartifice/thaumicwonders/client/renderers/tile/TesrDimensionalRipper.java
@@ -42,24 +42,29 @@ public void render(TileDimensionalRipper te, double x, double y, double z, float
             ShaderHelper.useShader(ShaderHelper.endShader, this.shaderCallback);
 
             GlStateManager.pushMatrix();
-            GlStateManager.translate(x + 0.5D, y + 0.5D, z + 0.5D);
             switch (BlockStateUtils.getFacing(te.getBlockMetadata())) {
                 case DOWN:
+                    GlStateManager.translate(x + 0.5D, y + 0.25D, z + 0.5D);
                     GlStateManager.rotate(180.0F, 1.0F, 0.0F, 0.0F);
                     break;
                 case NORTH:
+                    GlStateManager.translate(x + 0.5D, y + 0.5D, z + 0.25D);
                     GlStateManager.rotate(90.0F, -1.0F, 0.0F, 0.0F);
                     break;
                 case SOUTH:
+                    GlStateManager.translate(x + 0.5D, y + 0.5D, z + 0.75D);
                     GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F);
                     break;
                 case WEST:
+                    GlStateManager.translate(x + 0.25D, y + 0.5D, z + 0.5D);
                     GlStateManager.rotate(90.0F, 0.0F, 0.0F, 1.0F);
                     break;
                 case EAST:
+                    GlStateManager.translate(x + 0.75D, y + 0.5D, z + 0.5D);
                     GlStateManager.rotate(90.0F, 0.0F, 0.0F, -1.0F);
                     break;
                 case UP:
+                    GlStateManager.translate(x + 0.5D, y + 0.75D, z + 0.5D);
                 default:
                     // Don't rotate
                     break;

diff --git a/src/main/java/com/verdantartifice/thaumicwonders/proxy/ClientProxy.java b/src/main/java/com/verdantartifice/thaumicwonders/proxy/ClientProxy.java
@@ -1,9 +1,12 @@
 package com.verdantartifice.thaumicwonders.proxy;
 
+import com.verdantartifice.thaumicwonders.ThaumicWonders;
 import com.verdantartifice.thaumicwonders.client.config.KeyBindings;
 
+import net.minecraftforge.client.model.obj.OBJLoader;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import thaumcraft.client.lib.ender.ShaderHelper;
 
 public class ClientProxy extends CommonProxy {
     private ProxyEntities proxyEntities = new ProxyEntities();
@@ -13,6 +16,7 @@ public class ClientProxy extends CommonProxy {
     public void preInit(FMLPreInitializationEvent event) {
         super.preInit(event);
         this.proxyEntities.setupEntityRenderers();
+        OBJLoader.INSTANCE.addDomain(ThaumicWonders.MODID);
     }
 
     @Override

diff --git a/src/main/resources/assets/thaumicwonders/blockstates/dimensional_ripper.json b/src/main/resources/assets/thaumicwonders/blockstates/dimensional_ripper.json
@@ -1,22 +1,23 @@
 {
     "forge_marker": 1,
     "defaults": {
-        "model": "thaumicwonders:dimensional_ripper",
-        "transform": "forge:default-block"
-     },
+        "model": "thaumicwonders:dimensional_ripper.obj",
+        "transform": "forge:default-block",
+        "textures": {"#material_all": "thaumicwonders:blocks/dimensional_ripper"}
+    },
     "variants": {
-        "normal": [{}], "inventory": [{}],        
-        "enabled=false,facing=down":    { "model": "thaumicwonders:dimensional_ripper","x": 180 },
-        "enabled=false,facing=up":      { "model": "thaumicwonders:dimensional_ripper"},
-        "enabled=false,facing=north":   { "model": "thaumicwonders:dimensional_ripper","x": 90 },
-        "enabled=false,facing=south":   { "model": "thaumicwonders:dimensional_ripper","y": 180, "x": 90 },
-        "enabled=false,facing=west":    { "model": "thaumicwonders:dimensional_ripper","y": 270, "x": 90 },
-        "enabled=false,facing=east":    { "model": "thaumicwonders:dimensional_ripper","y": 90, "x": 90 },
-        "enabled=true,facing=down":     { "model": "thaumicwonders:dimensional_ripper","x": 180 },
-        "enabled=true,facing=up":       { "model": "thaumicwonders:dimensional_ripper"},
-        "enabled=true,facing=north":    { "model": "thaumicwonders:dimensional_ripper","x": 90 },
-        "enabled=true,facing=south":    { "model": "thaumicwonders:dimensional_ripper","y": 180, "x": 90 },
-        "enabled=true,facing=west":     { "model": "thaumicwonders:dimensional_ripper","y": 270, "x": 90 },
-        "enabled=true,facing=east":     { "model": "thaumicwonders:dimensional_ripper","y": 90, "x": 90 }
+        "normal": [{}], "inventory": [{}],
+        "enabled=false,facing=down":    { "model": "thaumicwonders:dimensional_ripper.obj","x": 180 },
+        "enabled=false,facing=up":      { "model": "thaumicwonders:dimensional_ripper.obj"},
+        "enabled=false,facing=north":   { "model": "thaumicwonders:dimensional_ripper.obj","x": 90 },
+        "enabled=false,facing=south":   { "model": "thaumicwonders:dimensional_ripper.obj","y": 180, "x": 90 },
+        "enabled=false,facing=west":    { "model": "thaumicwonders:dimensional_ripper.obj","y": 270, "x": 90 },
+        "enabled=false,facing=east":    { "model": "thaumicwonders:dimensional_ripper.obj","y": 90, "x": 90 },
+        "enabled=true,facing=down":     { "model": "thaumicwonders:dimensional_ripper.obj","x": 180 },
+        "enabled=true,facing=up":       { "model": "thaumicwonders:dimensional_ripper.obj"},
+        "enabled=true,facing=north":    { "model": "thaumicwonders:dimensional_ripper.obj","x": 90 },
+        "enabled=true,facing=south":    { "model": "thaumicwonders:dimensional_ripper.obj","y": 180, "x": 90 },
+        "enabled=true,facing=west":     { "model": "thaumicwonders:dimensional_ripper.obj","y": 270, "x": 90 },
+        "enabled=true,facing=east":     { "model": "thaumicwonders:dimensional_ripper.obj","y": 90, "x": 90 }
     }
-}
+}
diff --git a/src/main/resources/assets/thaumicwonders/models/block/dimensional_ripper.json b/src/main/resources/assets/thaumicwonders/models/block/dimensional_ripper.json
diff --git a/src/main/resources/assets/thaumicwonders/models/block/dimensional_ripper.mtl b/src/main/resources/assets/thaumicwonders/models/block/dimensional_ripper.mtl
@@ -0,0 +1,5 @@
+newmtl material_all
+Kd 1.000000 1.000000 1.000000
+map_Kd thaumicwonders:blocks/dimensional_ripper
+illum 2
+