Skip to content

Commit 97ca170

Browse files
committed
Remove debug
1 parent 34fb739 commit 97ca170

File tree

3 files changed

+4
-23
lines changed

3 files changed

+4
-23
lines changed

common/src/main/java/generations/gg/generations/core/generationscore/common/client/GenerationsTextureLoader.kt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,33 +53,24 @@ object GenerationsTextureLoader : ITextureLoader() {
5353
}
5454

5555
fun initialize(manager: ResourceManager) {
56-
println("[GenerationsTextureLoader] >> initialize: Starting reload")
5756
clear()
58-
println("[GenerationsTextureLoader] >> initialize: Cleared old textures")
5957
try {
6058
RARE_CANDY.listMatchingResourceStacks(manager).forEach { name, list ->
61-
println("[GenerationsTextureLoader] >> Processing resource stack: $name")
6259
list.forEach { resource ->
63-
println("[GenerationsTextureLoader] >> Reading resource: ${resource}")
6460
val obj = resource.openAsReader().use {
6561
SpriteRegistry.GSON.fromJson(it, JsonObject::class.java)
6662
}
67-
println("[GenerationsTextureLoader] >> Parsed JSON: $obj")
6863
val map = GenerationsUtils.decode(CODEC, obj)
69-
println("[GenerationsTextureLoader] >> Decoded map size: ${map.size}")
7064

7165
if (map.isNotEmpty()) {
7266
map.forEach { (key, value) ->
7367
val textureLoc = "${value.namespace}:textures/${value.path}.png".asResource()
74-
println("[GenerationsTextureLoader] >> Registering texture: key=$key, location=$textureLoc")
7568
register(key, SimpleTextureEnhanced(textureLoc))
7669
}
7770
}
7871
}
7972
}
80-
println("[GenerationsTextureLoader] >> initialize: Completed successfully")
8173
} catch (e: Exception) {
82-
println("[GenerationsTextureLoader] >> initialize: Exception encountered!")
8374
e.printStackTrace()
8475
throw RuntimeException(e)
8576
}

common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/WalkmonData.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -161,32 +161,22 @@ val ItemStack.title: Component
161161
}
162162

163163
fun ItemStack.populate(list: MutableList<Component>, context: TooltipContext) {
164-
println("[populate] === ENTER ===")
165-
println("[populate] Playback status: playing=$playing")
166164

167165
if (playing) {
168166
val song = currentSong
169-
println("[populate] Attempting to resolve current song: ${song}")
170-
println("[populate] Resolved song: $song")
171167

172168
if (song == null) {
173-
println("[populate] Song resolution failed. No tooltip added.")
174169
return
175170
}
176171

177172
val remainingSeconds = timeUntilNextSong / 20f
178-
println("[populate] Song: ${song.description.string}")
179-
println("[populate] Time left: $remainingSeconds / ${song.lengthInSeconds}")
180173

181174
list.add(Component.literal("Currently playing: ${song.description.string}"))
182175

183176
list.add(Component.literal("${(song.lengthInSeconds - remainingSeconds).timeCode()} / ${song.lengthInSeconds.timeCode()}"))
184177
} else {
185-
println("[populate] No song playing. Showing idle message.")
186178
list.add(Component.literal("Nothing is currently playing."))
187179
}
188-
189-
println("[populate] === EXIT ===")
190180
}
191181
//}
192182

common/src/main/resources/assets/generations_core/shaders/animated.vs.glsl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ float fog_distance(vec3 pos, int shape) {
5555
}
5656
}
5757

58-
vec4 getVertexColor(vec3 normal) {
58+
vec4 getVertexColor() {
5959
if(legacy) return vec4(1);
6060

6161
vec3 lightDir0 = normalize(Light0_Direction);
6262
vec3 lightDir1 = normalize(Light1_Direction);
63-
float light0 = max(0.0, dot(Light0_Direction, normal));
64-
float light1 = max(0.0, dot(Light1_Direction, normal));
63+
float light0 = max(0.0, dot(Light0_Direction, inNormal));
64+
float light1 = max(0.0, dot(Light1_Direction, inNormal));
6565
float lightAccum = min(1.0, (light0 + light1) * MINECRAFT_LIGHT_POWER + MINECRAFT_AMBIENT_LIGHT);
6666
return vec4(lightAccum, lightAccum, lightAccum, 1);
6767
}
@@ -72,7 +72,7 @@ void main() {
7272
vec4 worldPosition = modelTransform * vec4(positions, 1.0);
7373

7474
gl_Position = worldSpace * worldPosition;
75-
vertexColor = getVertexColor(inNormal * transpose(inverse(mat3(modelTransform))));
75+
vertexColor = getVertexColor();
7676
vertexDistance = fog_distance(gl_Position.xyz, FogShape);
7777
lightMapColor = texelFetch(lightmap, light / 16, 0);
7878
texCoord0 = (texcoords * uvScale) + uvOffset;

0 commit comments

Comments
 (0)