diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index 16d84bef..3ef9ff52 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -1,15 +1,18 @@ package WayofTime.bloodmagic.util.handler.event; -import java.util.ArrayList; -import java.util.List; +import java.util.*; import javax.annotation.Nullable; +import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.registry.RitualRegistry; +import com.google.common.base.Stopwatch; +import com.google.common.collect.SetMultimap; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; @@ -21,13 +24,13 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraftforge.client.event.MouseEvent; -import net.minecraftforge.client.event.RenderGameOverlayEvent; -import net.minecraftforge.client.event.RenderWorldLastEvent; -import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.client.event.*; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.InputEvent; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -55,6 +58,9 @@ import WayofTime.bloodmagic.util.helper.TextHelper; @SideOnly(Side.CLIENT) public class ClientHandler { + // Quick toggle for error suppression. Set to false if you wish to hide model errors. + public static final boolean SUPPRESS_ASSET_ERRORS = true; + public static TextureAtlasSprite ritualStoneBlank; public static TextureAtlasSprite ritualStoneWater; public static TextureAtlasSprite ritualStoneFire; @@ -79,6 +85,7 @@ public class ClientHandler private static EnumFacing mrsHoloDirection; private static boolean mrsHoloDisplay; + // Contrary to what your IDE tells you, this *is* actually needed. public static final BMKeyBinding keyOpenSigilHolding = new BMKeyBinding("openSigilHolding", Keyboard.KEY_H, BMKeyBinding.Key.OPEN_SIGIL_HOLDING); @SubscribeEvent @@ -199,6 +206,75 @@ public class ClientHandler element.render(minecraft, event.getResolution(), event.getPartialTicks()); } + // Stolen from Chisel + @SubscribeEvent + public void onModelBake(ModelBakeEvent event) { + if (BloodMagic.isDev() && SUPPRESS_ASSET_ERRORS) + return; + + Stopwatch stopwatch = Stopwatch.createStarted(); + Map modelErrors = ReflectionHelper.getPrivateValue(ModelLoader.class, event.getModelLoader(), "loadingExceptions"); + Set missingVariants = ReflectionHelper.getPrivateValue(ModelLoader.class, event.getModelLoader(), "missingVariants"); + + // Collect all Blood Magic model errors + List errored = new ArrayList(); + for (ResourceLocation modelError : modelErrors.keySet()) + if (modelError.getResourceDomain().equalsIgnoreCase(Constants.Mod.MODID)) + errored.add(modelError); + + // Collect all Blood Magic variant errors + List missing = new ArrayList(); + for (ModelResourceLocation missingVariant : missingVariants) + if (missingVariant.getResourceDomain().equalsIgnoreCase(Constants.Mod.MODID)) + missing.add(missingVariant); + + // Remove discovered model errors + for (ResourceLocation modelError : errored) + modelErrors.remove(modelError); + + // Remove discovered variant errors + missingVariants.removeAll(missing); + + if (errored.size() > 0) + BloodMagic.instance.getLogger().info("Suppressed {} model errors from Blood Magic.", errored.size()); + if (missing.size() > 0) + BloodMagic.instance.getLogger().info("Suppressed {} variant errors from Blood Magic.", missing.size()); + BloodMagic.instance.getLogger().debug("Suppressed discovered model/variant errors in {}", stopwatch.stop()); + } + + // For some reason, we need some bad textures to be listed in the Crystal and Node models. This will hide that from the end user. + @SubscribeEvent + public void onTextureStitch(TextureStitchEvent.Post event) { + if (BloodMagic.isDev() && SUPPRESS_ASSET_ERRORS) + return; + + Stopwatch stopwatch = Stopwatch.createStarted(); + SetMultimap missingTextures = ReflectionHelper.getPrivateValue(FMLClientHandler.class, FMLClientHandler.instance(), "missingTextures"); + Set badTextureDomains = ReflectionHelper.getPrivateValue(FMLClientHandler.class, FMLClientHandler.instance(), "badTextureDomains"); + + String mc = "minecraft"; + String format = "textures/%s.png"; + Set toRemove = new HashSet(); + + // Find our missing textures and mark them for removal. Cannot directly remove as it would cause a CME + if (missingTextures.containsKey(mc)) { + Set missingMCTextures = missingTextures.get(mc); + for (ResourceLocation texture : missingMCTextures) + if (texture.getResourcePath().equalsIgnoreCase(String.format(format, "node")) || texture.getResourcePath().equalsIgnoreCase(String.format(format, "crystal"))) + toRemove.add(texture); + } + + // Remove all our found errors + missingTextures.get(mc).removeAll(toRemove); + + // Make sure to only remove the bad MC domain if no other textures are missing + if (missingTextures.get(mc).isEmpty()) { + missingTextures.keySet().remove(mc); + badTextureDomains.remove(mc); + } + BloodMagic.instance.getLogger().debug("Suppressed required texture errors in {}", stopwatch.stop()); + } + private void cycleSigil(ItemStack stack, EntityPlayer player, int dWheel) { int mode = dWheel; diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockAltar.obj b/src/main/resources/assets/bloodmagic/models/block/BlockAltar.obj index 43d0782b..c782d043 100644 --- a/src/main/resources/assets/bloodmagic/models/block/BlockAltar.obj +++ b/src/main/resources/assets/bloodmagic/models/block/BlockAltar.obj @@ -188,12 +188,12 @@ vn 0.691400 0.662100 0.289100 vn 0.692800 0.661600 -0.286900 vn 0.820700 0.042600 -0.569800 usemtl Material__46 -s off +#s off f 1/1/1 2/2/1 3/3/1 4/4/1 f 5/5/2 6/6/2 7/7/2 8/8/2 f 9/9/3 10/10/3 11/11/3 12/12/3 f 13/13/4 14/14/4 15/15/4 16/16/4 -s 1 +#s 1 f 17/17/5 18/18/6 19/19/7 20/20/8 f 21/21/9 22/22/10 23/23/11 24/24/12 f 25/25/13 26/26/14 27/27/15 28/28/16 diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockDemonCrucible.obj b/src/main/resources/assets/bloodmagic/models/block/BlockDemonCrucible.obj index 60444901..9a9dac0b 100644 --- a/src/main/resources/assets/bloodmagic/models/block/BlockDemonCrucible.obj +++ b/src/main/resources/assets/bloodmagic/models/block/BlockDemonCrucible.obj @@ -622,7 +622,7 @@ vn 0.111500 -0.987600 0.110800 vn 0.993800 0.110800 -0.012400 vn -0.993800 -0.110800 0.012400 usemtl None -s 1 +#s 1 f 1/1/1 2/2/1 3/3/1 4/4/1 f 5/5/2 6/6/2 7/7/2 8/8/2 f 8/9/3 1/1/3 4/4/3 5/10/3 diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockDemonCrystallizer.obj b/src/main/resources/assets/bloodmagic/models/block/BlockDemonCrystallizer.obj index 5c467435..f103e27b 100644 --- a/src/main/resources/assets/bloodmagic/models/block/BlockDemonCrystallizer.obj +++ b/src/main/resources/assets/bloodmagic/models/block/BlockDemonCrystallizer.obj @@ -912,7 +912,7 @@ vn 0.000000 -0.707100 -0.707100 vn 0.000000 0.707100 -0.707100 vn 0.000000 -0.707100 0.707100 usemtl None -s 1 +#s 1 f 1/1/1 2/2/1 3/3/1 4/4/1 f 5/5/2 6/6/2 7/7/2 8/8/2 f 8/9/3 1/1/3 4/4/3 5/10/3 diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockDemonPylon.obj b/src/main/resources/assets/bloodmagic/models/block/BlockDemonPylon.obj index 649b1d93..27d28760 100644 --- a/src/main/resources/assets/bloodmagic/models/block/BlockDemonPylon.obj +++ b/src/main/resources/assets/bloodmagic/models/block/BlockDemonPylon.obj @@ -772,7 +772,7 @@ vn 0.111500 -0.987600 0.110800 vn 0.993800 0.110800 -0.012400 vn -0.993800 -0.110800 0.012400 usemtl None -s 1 +#s 1 f 1/1/1 2/2/1 3/3/1 4/4/1 f 5/5/2 6/6/2 7/7/2 8/8/2 f 8/9/3 1/1/3 4/4/3 5/10/3 diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockDimensionalPortal.json b/src/main/resources/assets/bloodmagic/models/block/BlockDimensionalPortal.json new file mode 100644 index 00000000..3c45f9df --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockDimensionalPortal.json @@ -0,0 +1,15 @@ +{ + "textures": { + "particle": "bloodmagic:blocks/lifeEssenceFlowing", + "portal": "bloodmagic:blocks/lifeEssenceFlowing" + }, + "elements": [ + { "from": [ 6, 0, 0 ], + "to": [ 10, 16, 16 ], + "faces": { + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" } + } + } + ] +} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockHellfireForge.obj b/src/main/resources/assets/bloodmagic/models/block/BlockHellfireForge.obj index 9bc0fa2f..1a818a41 100644 --- a/src/main/resources/assets/bloodmagic/models/block/BlockHellfireForge.obj +++ b/src/main/resources/assets/bloodmagic/models/block/BlockHellfireForge.obj @@ -590,7 +590,7 @@ vn 0.000000 -0.707100 -0.707100 vn 0.000000 0.707100 -0.707100 vn 0.000000 -0.707100 0.707100 usemtl None -s 1 +#s 1 f 1/1/1 2/2/1 3/3/1 4/4/1 f 5/5/2 6/6/2 7/7/2 8/8/2 f 8/9/3 1/1/3 4/4/3 5/10/3 diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockIncenseAltar.obj b/src/main/resources/assets/bloodmagic/models/block/BlockIncenseAltar.obj index d7f3cf2b..d78471a9 100644 --- a/src/main/resources/assets/bloodmagic/models/block/BlockIncenseAltar.obj +++ b/src/main/resources/assets/bloodmagic/models/block/BlockIncenseAltar.obj @@ -443,7 +443,7 @@ vn -0.139100 -0.980600 0.137800 vn 0.990300 -0.137800 0.019400 vn -0.990300 0.137800 -0.019400 usemtl None -s 1 +#s 1 f 1/1/1 2/2/1 3/3/1 4/4/1 f 5/5/2 6/6/2 7/7/2 8/8/2 f 8/9/3 1/1/3 4/4/3 5/10/3 diff --git a/src/main/resources/assets/bloodmagic/models/block/ModelAlchemyTable.mtl b/src/main/resources/assets/bloodmagic/models/block/ModelAlchemyTable.mtl index a93046fc..efa6ee21 100644 --- a/src/main/resources/assets/bloodmagic/models/block/ModelAlchemyTable.mtl +++ b/src/main/resources/assets/bloodmagic/models/block/ModelAlchemyTable.mtl @@ -2,10 +2,10 @@ # Material Count: 1 newmtl None -Ns 0 +#Ns 0 Ka 0.000000 0.000000 0.000000 Kd 0.8 0.8 0.8 -Ks 0.8 0.8 0.8 +#Ks 0.8 0.8 0.8 d 1 -illum 2 +#illum 2 map_Kd bloodmagic:models/alchemytable \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/ModelAlchemyTable.obj b/src/main/resources/assets/bloodmagic/models/block/ModelAlchemyTable.obj index e006b7e0..79c5c56a 100644 --- a/src/main/resources/assets/bloodmagic/models/block/ModelAlchemyTable.obj +++ b/src/main/resources/assets/bloodmagic/models/block/ModelAlchemyTable.obj @@ -30,7 +30,7 @@ vn 0.000000 -1.000000 0.000000 vn 0.965900 0.000000 -0.258800 vn -0.965900 -0.000000 0.258800 usemtl None -s off +#s off f 1/1/1 2/2/1 3/3/1 4/4/1 f 5/5/2 6/6/2 7/7/2 8/8/2 f 4/4/3 3/3/3 8/9/3 7/10/3 @@ -67,7 +67,7 @@ vn 0.173600 -0.984800 -0.000000 vn 0.984800 0.173600 0.000000 vn -0.984800 -0.173600 -0.000000 usemtl None -s off +#s off f 9/14/7 10/15/7 11/16/7 12/17/7 f 13/18/8 14/19/8 15/20/8 16/21/8 f 12/17/9 11/16/9 16/22/9 15/23/9 @@ -104,7 +104,7 @@ vn -0.454000 -0.891000 -0.000000 vn 0.891000 -0.454000 -0.000000 vn -0.891000 0.454000 0.000000 usemtl None -s off +#s off f 17/28/13 18/29/13 19/30/13 20/31/13 f 21/32/14 22/33/14 23/34/14 24/35/14 f 20/31/15 19/30/15 24/36/15 23/37/15 @@ -140,7 +140,7 @@ vn -0.000000 -1.000000 -0.000000 vn 0.965900 0.000000 -0.258800 vn -0.965900 0.000000 0.258800 usemtl None -s off +#s off f 25/42/19 26/43/19 27/44/19 28/45/19 f 29/46/20 30/47/20 31/48/20 32/49/20 f 28/45/21 27/44/21 32/50/21 31/51/21 @@ -177,7 +177,7 @@ vn -0.195100 -0.980800 0.000000 vn 0.937200 -0.186400 0.294900 vn -0.937200 0.186400 -0.294900 usemtl None -s off +#s off f 33/55/25 34/56/25 35/57/25 36/58/25 f 37/59/26 38/60/26 39/61/26 40/62/26 f 36/58/27 35/57/27 40/63/27 39/64/27 @@ -214,7 +214,7 @@ vn 0.000000 -1.000000 -0.000000 vn 1.000000 0.000000 0.000000 vn -1.000000 0.000000 0.000000 usemtl None -s off +#s off f 41/69/31 42/70/31 43/71/31 44/72/31 f 45/73/32 46/74/32 47/75/32 48/76/32 f 44/72/33 43/71/33 48/77/33 47/78/33 @@ -251,7 +251,7 @@ vn -0.269800 -0.962900 0.000000 vn 0.889600 -0.249200 0.382700 vn -0.889600 0.249200 -0.382700 usemtl None -s off +#s off f 49/83/37 50/84/37 51/85/37 52/86/37 f 53/87/38 54/88/38 55/89/38 56/90/38 f 52/86/39 51/85/39 56/91/39 55/92/39 @@ -287,7 +287,7 @@ vn 0.000000 -1.000000 0.000000 vn 0.974400 -0.000000 -0.225000 vn -0.974400 0.000000 0.225000 usemtl None -s off +#s off f 57/97/43 58/98/43 59/99/43 60/100/43 f 61/101/44 62/102/44 63/103/44 64/104/44 f 60/100/45 59/99/45 64/105/45 63/106/45 @@ -324,7 +324,7 @@ vn 0.000000 -1.000000 0.000000 vn 1.000000 0.000000 0.000000 vn -1.000000 0.000000 0.000000 usemtl None -s off +#s off f 65/110/49 66/111/49 67/112/49 68/113/49 f 69/114/50 70/115/50 71/116/50 72/117/50 f 68/113/51 67/112/51 72/118/51 71/119/51 @@ -360,7 +360,7 @@ vn 0.000000 -1.000000 0.000000 vn 0.923900 0.000000 0.382700 vn -0.923900 0.000000 -0.382700 usemtl None -s off +#s off f 73/124/55 74/125/55 75/126/55 76/127/55 f 77/128/56 78/129/56 79/130/56 80/131/56 f 76/127/57 75/126/57 80/132/57 79/133/57 @@ -396,7 +396,7 @@ vn 0.000000 -1.000000 -0.000000 vn 0.707100 0.000000 0.707100 vn -0.707100 0.000000 -0.707100 usemtl None -s off +#s off f 81/137/61 82/138/61 83/139/61 84/140/61 f 85/141/62 86/142/62 87/143/62 88/144/62 f 84/140/63 83/139/63 88/145/63 87/146/63 @@ -432,7 +432,7 @@ vn 0.000000 -1.000000 0.000000 vn 0.965900 0.000000 0.258800 vn -0.965900 0.000000 -0.258800 usemtl None -s off +#s off f 89/150/67 90/151/67 91/152/67 92/153/67 f 93/154/68 94/155/68 95/156/68 96/157/68 f 92/153/69 91/152/69 96/158/69 95/159/69 @@ -469,7 +469,7 @@ vn 0.000000 -1.000000 0.000000 vn 1.000000 0.000000 0.000000 vn -1.000000 0.000000 0.000000 usemtl None -s off +#s off f 97/163/73 98/164/73 99/165/73 100/166/73 f 101/167/74 102/168/74 103/169/74 104/170/74 f 100/166/75 99/165/75 104/171/75 103/172/75 @@ -506,7 +506,7 @@ vn 0.000000 -1.000000 0.000000 vn 0.923900 0.000000 0.382700 vn -0.923900 0.000000 -0.382700 usemtl None -s off +#s off f 105/177/79 106/178/79 107/179/79 108/180/79 f 109/181/80 110/182/80 111/183/80 112/184/80 f 108/180/81 107/179/81 112/185/81 111/186/81 @@ -542,7 +542,7 @@ vn 0.000000 -1.000000 -0.000000 vn 0.965900 0.000000 0.258800 vn -0.965900 0.000000 -0.258800 usemtl None -s off +#s off f 113/191/85 114/192/85 115/193/85 116/194/85 f 117/195/86 118/196/86 119/197/86 120/198/86 f 116/194/87 115/193/87 120/199/87 119/200/87 @@ -578,7 +578,7 @@ vn 0.000000 -1.000000 -0.000000 vn 0.923900 0.000000 0.382700 vn -0.923900 0.000000 -0.382700 usemtl None -s off +#s off f 121/204/91 122/205/91 123/206/91 124/207/91 f 125/208/92 126/209/92 127/210/92 128/211/92 f 124/207/93 123/206/93 128/212/93 127/213/93 @@ -615,7 +615,7 @@ vn 0.000000 -1.000000 -0.000000 vn 1.000000 0.000000 0.000000 vn -1.000000 -0.000000 0.000000 usemtl None -s off +#s off f 129/217/97 130/218/97 131/219/97 132/220/97 f 133/221/98 134/222/98 135/223/98 136/224/98 f 132/220/99 131/219/99 136/225/99 135/226/99 @@ -651,7 +651,7 @@ vn 0.000000 -1.000000 0.000000 vn 0.923900 0.000000 0.382700 vn -0.923900 0.000000 -0.382700 usemtl None -s off +#s off f 137/231/103 138/232/103 139/233/103 140/234/103 f 141/235/104 142/236/104 143/237/104 144/238/104 f 140/234/105 139/233/105 144/239/105 143/240/105 @@ -688,7 +688,7 @@ vn 0.000000 -1.000000 -0.000000 vn 1.000000 -0.000000 0.000000 vn -1.000000 -0.000000 0.000000 usemtl None -s off +#s off f 145/244/109 146/245/109 147/246/109 148/247/109 f 149/248/110 150/249/110 151/250/110 152/251/110 f 148/247/111 147/246/111 152/252/111 151/253/111 @@ -724,7 +724,7 @@ vn -0.224900 -0.974400 -0.000000 vn 0.974400 -0.225000 -0.000000 vn -0.974400 0.225000 0.000000 usemtl None -s off +#s off f 153/258/115 154/259/115 155/260/115 156/261/115 f 157/262/116 158/263/116 159/264/116 160/265/116 f 156/261/117 155/260/117 160/266/117 159/267/117 @@ -760,7 +760,7 @@ vn 0.000000 -1.000000 0.000000 vn 0.974400 0.000000 -0.225000 vn -0.974400 0.000000 0.224900 usemtl None -s off +#s off f 161/271/121 162/272/121 163/273/121 164/274/121 f 165/275/122 166/276/122 167/277/122 168/278/122 f 164/274/123 163/273/123 168/279/123 167/280/123 @@ -797,7 +797,7 @@ vn 0.000000 -1.000000 -0.000000 vn 1.000000 -0.000000 0.000000 vn -1.000000 0.000000 0.000000 usemtl None -s off +#s off f 169/284/127 170/285/127 171/286/127 172/287/127 f 173/288/128 174/289/128 175/290/128 176/291/128 f 172/287/129 171/286/129 176/292/129 175/293/129 @@ -833,7 +833,7 @@ vn 0.000000 -1.000000 -0.000000 vn 0.923900 0.000000 0.382700 vn -0.923900 0.000000 -0.382700 usemtl None -s off +#s off f 177/298/133 178/299/133 179/300/133 180/301/133 f 181/302/134 182/303/134 183/304/134 184/305/134 f 180/301/135 179/300/135 184/306/135 183/307/135 @@ -870,7 +870,7 @@ vn -0.173600 -0.984800 -0.000000 vn 0.984800 -0.173600 -0.000000 vn -0.984800 0.173600 0.000000 usemtl None -s off +#s off f 185/311/139 186/312/139 187/313/139 188/314/139 f 189/315/140 190/316/140 191/317/140 192/318/140 f 188/314/141 187/313/141 192/319/141 191/320/141 @@ -906,7 +906,7 @@ vn -0.000000 -1.000000 0.000000 vn 0.923900 -0.000000 0.382700 vn -0.923900 0.000000 -0.382700 usemtl None -s off +#s off f 193/325/145 194/326/145 195/327/145 196/328/145 f 197/329/146 198/330/146 199/331/146 200/332/146 f 196/328/147 195/327/147 200/333/147 199/334/147 @@ -942,7 +942,7 @@ vn 0.000000 -1.000000 0.000000 vn 0.965900 0.000000 -0.258800 vn -0.965900 0.000000 0.258800 usemtl None -s off +#s off f 201/338/151 202/339/151 203/340/151 204/341/151 f 205/342/152 206/343/152 207/344/152 208/345/152 f 204/341/153 203/340/153 208/346/153 207/347/153 @@ -978,7 +978,7 @@ vn 0.224900 -0.974400 -0.000000 vn 0.974400 0.225000 0.000000 vn -0.974400 -0.225000 -0.000000 usemtl None -s off +#s off f 209/351/157 210/352/157 211/353/157 212/354/157 f 213/355/158 214/356/158 215/357/158 216/358/158 f 212/354/159 211/353/159 216/359/159 215/360/159 @@ -1015,7 +1015,7 @@ vn 0.000000 -1.000000 0.000000 vn 0.923900 0.000000 0.382700 vn -0.923900 0.000000 -0.382700 usemtl None -s off +#s off f 217/364/163 218/365/163 219/366/163 220/367/163 f 221/368/164 222/369/164 223/370/164 224/371/164 f 220/367/165 219/366/165 224/372/165 223/373/165 @@ -1051,7 +1051,7 @@ vn 0.000000 -1.000000 0.000000 vn 0.707100 0.000000 0.707100 vn -0.707100 0.000000 -0.707100 usemtl None -s off +#s off f 225/378/169 226/379/169 227/380/169 228/381/169 f 229/382/170 230/383/170 231/384/170 232/385/170 f 228/381/171 227/380/171 232/386/171 231/387/171 @@ -1088,7 +1088,7 @@ vn 0.454000 -0.891000 -0.000000 vn 0.891000 0.454000 0.000000 vn -0.891000 -0.454000 -0.000000 usemtl None -s off +#s off f 233/391/175 234/392/175 235/393/175 236/394/175 f 237/395/176 238/396/176 239/397/176 240/398/176 f 236/394/177 235/393/177 240/399/177 239/400/177 @@ -1125,7 +1125,7 @@ vn -0.000000 -1.000000 -0.000000 vn 0.965900 0.000000 -0.258800 vn -0.965900 0.000000 0.258800 usemtl None -s off +#s off f 241/405/181 242/406/181 243/407/181 244/408/181 f 245/409/182 246/410/182 247/411/182 248/412/182 f 244/408/183 243/407/183 248/413/183 247/414/183 @@ -1162,7 +1162,7 @@ vn 0.000000 -1.000000 0.000000 vn 0.923900 0.000000 0.382700 vn -0.923900 0.000000 -0.382700 usemtl None -s off +#s off f 249/419/187 250/420/187 251/421/187 252/422/187 f 253/423/188 254/424/188 255/425/188 256/426/188 f 252/422/189 251/421/189 256/427/189 255/428/189 @@ -1180,7 +1180,7 @@ vt 0.093750 1.000000 vt 0.046875 1.000000 vn 0.000000 1.000000 -0.000000 usemtl None -s off +#s off f 260/433/193 259/434/193 258/435/193 257/436/193 o CrucibleSide2 v -0.586680 0.962500 0.682350 @@ -1212,7 +1212,7 @@ vn 0.000000 -1.000000 0.000000 vn 0.923900 0.000000 0.382700 vn -0.923900 0.000000 -0.382700 usemtl None -s off +#s off f 261/437/194 262/438/194 263/439/194 264/440/194 f 265/441/195 266/442/195 267/443/195 268/444/195 f 264/440/196 263/439/196 268/445/196 267/446/196 @@ -1248,7 +1248,7 @@ vn 0.000000 -1.000000 0.000000 vn 0.923900 -0.000000 0.382700 vn -0.923900 0.000000 -0.382700 usemtl None -s off +#s off f 269/451/200 270/452/200 271/453/200 272/454/200 f 273/455/201 274/456/201 275/457/201 276/458/201 f 272/454/202 271/453/202 276/459/202 275/460/202 diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal1.obj b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal1.obj index bac84bcc..e314fe52 100644 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal1.obj +++ b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal1.obj @@ -21,7 +21,7 @@ vn 0.338600 -0.133400 0.931400 vn -0.915300 -0.246300 -0.318600 vn 0.958400 0.272000 -0.086300 usemtl Material.001 -s 1 +#s 1 f 1/1/1 2/2/1 3/3/1 4/4/1 f 2/1/2 5/2/2 6/3/2 3/4/2 f 5/1/3 7/2/3 8/3/3 6/4/3 diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal2.obj b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal2.obj index 93b0f4bc..879cc0dc 100644 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal2.obj +++ b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal2.obj @@ -21,7 +21,7 @@ vn 0.744000 0.043000 0.666800 vn -0.493000 -0.785700 -0.373600 vn 0.558900 0.619400 0.551300 usemtl Material.001 -s 1 +#s 1 f 1/1/1 2/2/1 3/3/1 4/4/1 f 2/1/2 5/2/2 6/3/2 3/4/2 f 5/1/3 7/2/3 8/3/3 6/4/3 diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal3.obj b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal3.obj index 2fdc3ebd..39622f29 100644 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal3.obj +++ b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal3.obj @@ -21,7 +21,7 @@ vn -0.561200 -0.040200 0.826700 vn 0.026100 -0.886100 0.462800 vn -0.015500 0.916400 -0.400000 usemtl Material.001 -s 1 +#s 1 f 1/1/1 2/2/1 3/3/1 4/4/1 f 2/1/2 5/2/2 6/3/2 3/4/2 f 5/1/3 7/2/3 8/3/3 6/4/3 diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal4.obj b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal4.obj index 454e3cba..e8f1cc50 100644 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal4.obj +++ b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal4.obj @@ -21,7 +21,7 @@ vn -0.184300 0.445100 0.876300 vn -0.177800 -0.931100 -0.318400 vn 0.187400 0.849200 0.493700 usemtl Material.001 -s 1 +#s 1 f 1/1/1 2/2/1 3/3/1 4/4/1 f 2/1/2 5/2/2 6/3/2 3/4/2 f 5/1/3 7/2/3 8/3/3 6/4/3 diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal5.obj b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal5.obj index 0840882b..0443a2c1 100644 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal5.obj +++ b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal5.obj @@ -21,7 +21,7 @@ vn 0.892800 0.342800 0.292300 vn 0.544200 -0.664400 0.512300 vn -0.373400 0.733900 -0.567400 usemtl Material.001 -s 1 +#s 1 f 1/1/1 2/2/1 3/3/1 4/4/1 f 2/1/2 5/2/2 6/3/2 3/4/2 f 5/1/3 7/2/3 8/3/3 6/4/3 diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal6.obj b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal6.obj index d0fdac2a..e1a9c758 100644 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal6.obj +++ b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal6.obj @@ -21,7 +21,7 @@ vn 0.524900 0.093900 0.846000 vn -0.459900 -0.884000 0.083600 vn 0.279000 0.954200 -0.108500 usemtl Material.001 -s 1 +#s 1 f 1/1/1 2/2/1 3/3/1 4/4/1 f 2/1/2 5/2/2 6/3/2 3/4/2 f 5/1/3 7/2/3 8/3/3 6/4/3 diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal7.obj b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal7.obj index 8feb9f51..06103068 100644 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal7.obj +++ b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal7.obj @@ -21,7 +21,7 @@ vn 0.206700 -0.449100 0.869200 vn 0.198600 -0.634800 -0.746700 vn -0.189400 0.650900 0.735200 usemtl Material.001 -s 1 +#s 1 f 1/1/1 2/2/1 3/3/1 4/4/1 f 2/1/2 5/2/2 6/3/2 3/4/2 f 5/1/3 7/2/3 8/3/3 6/4/3 diff --git a/src/main/resources/assets/bloodmagic/models/block/routing/ModelMasterRoutingNodeBase.obj b/src/main/resources/assets/bloodmagic/models/block/routing/ModelMasterRoutingNodeBase.obj index 52817c03..14d04104 100644 --- a/src/main/resources/assets/bloodmagic/models/block/routing/ModelMasterRoutingNodeBase.obj +++ b/src/main/resources/assets/bloodmagic/models/block/routing/ModelMasterRoutingNodeBase.obj @@ -249,7 +249,7 @@ vn 0.224900 -0.974400 -0.000000 vn 0.974400 0.224900 0.000000 vn -0.974400 -0.224900 0.000000 usemtl None -s 1 +#s 1 f 1/1/1 2/2/1 3/3/1 4/4/1 f 5/5/2 6/6/2 7/7/2 8/8/2 f 8/9/3 1/1/3 4/4/3 5/10/3 diff --git a/src/main/resources/assets/bloodmagic/models/block/routing/ModelMasterRoutingNodeCore.obj b/src/main/resources/assets/bloodmagic/models/block/routing/ModelMasterRoutingNodeCore.obj index ced35a5c..3a13a61e 100644 --- a/src/main/resources/assets/bloodmagic/models/block/routing/ModelMasterRoutingNodeCore.obj +++ b/src/main/resources/assets/bloodmagic/models/block/routing/ModelMasterRoutingNodeCore.obj @@ -51,7 +51,7 @@ vn 0.000000 -1.000000 -0.000000 vn 1.000000 0.000000 0.000000 vn -1.000000 0.000000 0.000000 usemtl None -s 1 +#s 1 f 1/1/1 2/2/1 3/3/1 4/4/1 f 5/5/2 6/6/2 7/7/2 8/8/2 f 8/9/3 1/1/3 4/4/3 5/10/3 diff --git a/src/main/resources/assets/bloodmagic/models/block/routing/ModelRoutingNodeBase.obj b/src/main/resources/assets/bloodmagic/models/block/routing/ModelRoutingNodeBase.obj index 60b3bd3e..ff7b3e20 100644 --- a/src/main/resources/assets/bloodmagic/models/block/routing/ModelRoutingNodeBase.obj +++ b/src/main/resources/assets/bloodmagic/models/block/routing/ModelRoutingNodeBase.obj @@ -309,7 +309,7 @@ vn 0.224900 -0.974400 -0.000000 vn 0.974400 0.224900 0.000000 vn -0.974400 -0.224900 0.000000 usemtl None -s 1 +#s 1 f 1/1/1 2/2/1 3/3/1 4/4/1 f 5/5/2 6/6/2 7/7/2 8/8/2 f 8/9/3 1/1/3 4/4/3 5/10/3 diff --git a/src/main/resources/assets/bloodmagic/models/block/routing/ModelRoutingNodeCore.obj b/src/main/resources/assets/bloodmagic/models/block/routing/ModelRoutingNodeCore.obj index 623b6aeb..36886c98 100644 --- a/src/main/resources/assets/bloodmagic/models/block/routing/ModelRoutingNodeCore.obj +++ b/src/main/resources/assets/bloodmagic/models/block/routing/ModelRoutingNodeCore.obj @@ -51,7 +51,7 @@ vn 0.000000 -1.000000 -0.000000 vn 1.000000 0.000000 0.000000 vn -1.000000 0.000000 0.000000 usemtl None -s 1 +#s 1 f 1/1/1 2/2/1 3/3/1 4/4/1 f 5/5/2 6/6/2 7/7/2 8/8/2 f 8/9/3 1/1/3 4/4/3 5/10/3 diff --git a/src/main/resources/assets/bloodmagic/models/block/sub/BlockAltar.obj b/src/main/resources/assets/bloodmagic/models/block/sub/BlockAltar.obj index 43d0782b..c782d043 100644 --- a/src/main/resources/assets/bloodmagic/models/block/sub/BlockAltar.obj +++ b/src/main/resources/assets/bloodmagic/models/block/sub/BlockAltar.obj @@ -188,12 +188,12 @@ vn 0.691400 0.662100 0.289100 vn 0.692800 0.661600 -0.286900 vn 0.820700 0.042600 -0.569800 usemtl Material__46 -s off +#s off f 1/1/1 2/2/1 3/3/1 4/4/1 f 5/5/2 6/6/2 7/7/2 8/8/2 f 9/9/3 10/10/3 11/11/3 12/12/3 f 13/13/4 14/14/4 15/15/4 16/16/4 -s 1 +#s 1 f 17/17/5 18/18/6 19/19/7 20/20/8 f 21/21/9 22/22/10 23/23/11 24/24/12 f 25/25/13 26/26/14 27/27/15 28/28/16