From ab39b7e4e00c007b8b7e45e74a4a54a832662972 Mon Sep 17 00:00:00 2001 From: RainWarrior Date: Fri, 30 Jan 2015 03:10:09 +0300 Subject: [PATCH] Removed leftover debug messages --- .../minecraftforge/client/model/b3d/B3DLoader.java | 6 ------ .../minecraftforge/client/model/b3d/B3DModel.java | 12 ------------ 2 files changed, 18 deletions(-) diff --git a/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java b/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java index 1164197b9..e0440ba6b 100644 --- a/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java +++ b/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java @@ -1,7 +1,5 @@ package net.minecraftforge.client.model.b3d; -import static net.minecraftforge.client.model.b3d.B3DModel.logger; - import java.io.FileNotFoundException; import java.io.IOException; import java.nio.ByteBuffer; @@ -244,7 +242,6 @@ public class B3DLoader implements ICustomModelLoader if(key == null) { FMLLog.severe("invalid key index: " + frame); - logger.debug(String.format("getMatrix: %s %s\n%s %s %s\n%s", frame, node, node.getPos(), node.getScale(), node.getRot(), ret)); } else { @@ -252,7 +249,6 @@ public class B3DLoader implements ICustomModelLoader Matrix4f rm = new TRSRTransformation(node.getPos(), node.getRot(), node.getScale(), null).getMatrix(); rm.invert(); ret = ret.compose(new TRSRTransformation(rm)); - logger.debug(String.format("getMatrix: %s %s\n%s %s %s\n%s %s %s\n%s", frame, node, node.getPos(), node.getScale(), node.getRot(), key.getPos(), key.getScale(), key.getRot(), ret)); } return ret; } @@ -328,7 +324,6 @@ public class B3DLoader implements ICustomModelLoader String path = t.getPath(); if(path.endsWith(".png")) path = path.substring(0, path.length() - ".png".length()); builder.put(t.getPath(), new ResourceLocation(location.getResourceDomain(), path)); - System.out.println("Texture: " + path); } return builder.build(); } @@ -566,7 +561,6 @@ public class B3DLoader implements ICustomModelLoader @Override public BakedWrapper handleBlockState(IBlockState state) { - System.out.println("handleBlockState " + state); if(state instanceof IExtendedBlockState) { IExtendedBlockState exState = (IExtendedBlockState)state; diff --git a/src/main/java/net/minecraftforge/client/model/b3d/B3DModel.java b/src/main/java/net/minecraftforge/client/model/b3d/B3DModel.java index 9c2e18b7f..6f12f37d3 100644 --- a/src/main/java/net/minecraftforge/client/model/b3d/B3DModel.java +++ b/src/main/java/net/minecraftforge/client/model/b3d/B3DModel.java @@ -208,16 +208,13 @@ public class B3DModel List ret = new ArrayList(); while(buf.hasRemaining()) { - logger.debug("TEST"); String path = readString(); - logger.debug("path: '" + path + "'"); int flags = buf.getInt(); int blend = buf.getInt(); Vector2f pos = new Vector2f(buf.getFloat(), buf.getFloat()); Vector2f scale = new Vector2f(buf.getFloat(), buf.getFloat()); float rot = buf.getFloat(); ret.add(new Texture(path, flags, blend, pos, scale, rot)); - logger.debug("TEX: '" + path + "' " + flags + " " + blend + " " + pos + " " + scale + " " + rot); } popLimit(); this.textures.addAll(ret); @@ -360,7 +357,6 @@ public class B3DModel rot = readQuat(); } Key key = new Key(pos, scale, rot); - //logger.debug("Key: " + frame + " " + key); Key oldKey = animations.peek().get(frame, null); if(oldKey != null) { @@ -436,7 +432,6 @@ public class B3DModel { for(Table.Cell>, Key> key : keyData.cellSet()) { - logger.debug("KEY1: " + key + " " + node); animations.peek().put(key.getRowKey(), key.getColumnKey().or(Optional.of(node)), key.getValue()); } } @@ -625,16 +620,12 @@ public class B3DModel { totalWeight += bone.getLeft(); Matrix4f bm = animator.apply(bone.getRight()); - logger.debug("w:" + totalWeight + " bone: " + bone.getRight().getName() + " bm: \n" + bm); bm.mul(bone.getLeft()); t.add(bm); - logger.debug("t: \n" + t); } if(totalWeight != 0) t.mul(1f / totalWeight); } - logger.debug("t: \n" + t); - // pos Vector4f pos = new Vector4f(this.pos), newPos = new Vector4f(); pos.w = 1; @@ -861,7 +852,6 @@ public class B3DModel public void setAnimation(Animation animation) { - logger.debug("setAnimation " + animation + " " + this); this.animation = animation; Deque> q = new ArrayDeque>(nodes.values()); @@ -879,7 +869,6 @@ public class B3DModel ImmutableTable.Builder, Key> builder = ImmutableTable.builder(); for(Table.Cell>, Key> key : keyData.cellSet()) { - //logger.debug("KEY2: " + key + " " + this); builder.put(key.getRowKey(), key.getColumnKey().or(this), key.getValue()); } setAnimation(new Animation(animData.getLeft(), animData.getMiddle(), animData.getRight(), builder.build())); @@ -1037,7 +1026,6 @@ public class B3DModel for(Pair b : bone.getKind().getData()) { builder.put(b.getLeft(), Pair.of(b.getRight(), bone)); - logger.debug("Weight: " + b.getRight() + " " + bone.getName() + " " + b.getLeft().getPos()); } } weightMap = builder.build();