Skip to content

Commit 3d2a907

Browse files
Protoxy22Protoxy22
authored
Merge pull request #7 from TimLee9024/1.19-Fabric-2.0
MCglTF-Example-1.19.2-Fabric-2.0.0.0
2 parents f700f24 + 914a540 commit 3d2a907

File tree

11 files changed

+39
-42
lines changed

11 files changed

+39
-42
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version '0.12-SNAPSHOT'
2+
id 'fabric-loom' version '1.0-SNAPSHOT'
33
id 'maven-publish'
44
}
55

‎gradle.properties‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ org.gradle.jvmargs=-Xmx4G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/develop
6-
minecraft_version=1.19
7-
loader_version=0.14.8
6+
minecraft_version=1.19.2
7+
loader_version=0.14.10
88

99
# Mod Properties
10-
mod_version = 1.19-Fabric-1.0.0.0
11-
maven_group = com.timlee9024.mcgltf.example
10+
mod_version = 1.19.2-Fabric-2.0.0.0
11+
maven_group = com.modularmods.mcgltf.example
1212
archives_base_name = MCglTF-Example
1313

1414
# Dependencies
15-
fabric_version=0.58.0+1.19
15+
fabric_version=0.64.0+1.19.2

src/main/java/com/timlee9024/mcgltf/example/Example.java renamed to src/main/java/com/modularmods/mcgltf/example/Example.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.timlee9024.mcgltf.example;
1+
package com.modularmods.mcgltf.example;
22

33
import net.fabricmc.api.ModInitializer;
44
import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;

src/main/java/com/timlee9024/mcgltf/example/ExampleBlock.java renamed to src/main/java/com/modularmods/mcgltf/example/ExampleBlock.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.timlee9024.mcgltf.example;
1+
package com.modularmods.mcgltf.example;
22

33
import net.minecraft.core.BlockPos;
44
import net.minecraft.core.Direction;

src/main/java/com/timlee9024/mcgltf/example/ExampleBlockEntity.java renamed to src/main/java/com/modularmods/mcgltf/example/ExampleBlockEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.timlee9024.mcgltf.example;
1+
package com.modularmods.mcgltf.example;
22

33
import net.minecraft.core.BlockPos;
44
import net.minecraft.world.level.block.entity.BlockEntity;

src/main/java/com/timlee9024/mcgltf/example/ExampleBlockEntityRenderer.java renamed to src/main/java/com/modularmods/mcgltf/example/ExampleBlockEntityRenderer.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.timlee9024.mcgltf.example;
1+
package com.modularmods.mcgltf.example;
22

33
import java.util.ArrayList;
44
import java.util.List;
@@ -11,12 +11,12 @@
1111
import com.mojang.blaze3d.platform.GlStateManager;
1212
import com.mojang.blaze3d.vertex.PoseStack;
1313
import com.mojang.math.Quaternion;
14-
import com.timlee9024.mcgltf.IGltfModelReceiver;
15-
import com.timlee9024.mcgltf.MCglTF;
16-
import com.timlee9024.mcgltf.RenderedGltfModel;
17-
import com.timlee9024.mcgltf.RenderedGltfScene;
18-
import com.timlee9024.mcgltf.animation.GltfAnimationCreator;
19-
import com.timlee9024.mcgltf.animation.InterpolatedChannel;
14+
import com.modularmods.mcgltf.IGltfModelReceiver;
15+
import com.modularmods.mcgltf.MCglTF;
16+
import com.modularmods.mcgltf.RenderedGltfModel;
17+
import com.modularmods.mcgltf.RenderedGltfScene;
18+
import com.modularmods.mcgltf.animation.GltfAnimationCreator;
19+
import com.modularmods.mcgltf.animation.InterpolatedChannel;
2020

2121
import de.javagl.jgltf.model.AnimationModel;
2222
import net.minecraft.client.renderer.MultiBufferSource;
@@ -139,7 +139,6 @@ public void render(ExampleBlockEntity p_112307_, float p_112308_, PoseStack p_11
139139
GL30.glBindVertexArray(currentVAO);
140140
GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, currentArrayBuffer);
141141
GL15.glBindBuffer(GL15.GL_ELEMENT_ARRAY_BUFFER, currentElementArrayBuffer);
142-
RenderedGltfModel.nodeGlobalTransformLookup.clear();
143142
}
144143

145144
}

src/main/java/com/timlee9024/mcgltf/example/ExampleClient.java renamed to src/main/java/com/modularmods/mcgltf/example/ExampleClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.timlee9024.mcgltf.example;
1+
package com.modularmods.mcgltf.example;
22

3-
import com.timlee9024.mcgltf.MCglTF;
3+
import com.modularmods.mcgltf.MCglTF;
44

55
import net.fabricmc.api.ClientModInitializer;
66
import net.fabricmc.fabric.api.client.rendering.v1.BlockEntityRendererRegistry;

src/main/java/com/timlee9024/mcgltf/example/ExampleEntity.java renamed to src/main/java/com/modularmods/mcgltf/example/ExampleEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.timlee9024.mcgltf.example;
1+
package com.modularmods.mcgltf.example;
22

33
import net.minecraft.world.entity.EntityType;
44
import net.minecraft.world.entity.npc.Villager;

src/main/java/com/timlee9024/mcgltf/example/ExampleEntityRenderer.java renamed to src/main/java/com/modularmods/mcgltf/example/ExampleEntityRenderer.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.timlee9024.mcgltf.example;
1+
package com.modularmods.mcgltf.example;
22

33
import java.util.ArrayList;
44
import java.util.List;
@@ -11,12 +11,12 @@
1111
import com.mojang.blaze3d.platform.GlStateManager;
1212
import com.mojang.blaze3d.vertex.PoseStack;
1313
import com.mojang.math.Quaternion;
14-
import com.timlee9024.mcgltf.IGltfModelReceiver;
15-
import com.timlee9024.mcgltf.MCglTF;
16-
import com.timlee9024.mcgltf.RenderedGltfModel;
17-
import com.timlee9024.mcgltf.RenderedGltfScene;
18-
import com.timlee9024.mcgltf.animation.GltfAnimationCreator;
19-
import com.timlee9024.mcgltf.animation.InterpolatedChannel;
14+
import com.modularmods.mcgltf.IGltfModelReceiver;
15+
import com.modularmods.mcgltf.MCglTF;
16+
import com.modularmods.mcgltf.RenderedGltfModel;
17+
import com.modularmods.mcgltf.RenderedGltfScene;
18+
import com.modularmods.mcgltf.animation.GltfAnimationCreator;
19+
import com.modularmods.mcgltf.animation.InterpolatedChannel;
2020

2121
import de.javagl.jgltf.model.AnimationModel;
2222
import net.minecraft.client.renderer.MultiBufferSource;
@@ -122,7 +122,6 @@ public void render(ExampleEntity p_114485_, float p_114486_, float p_114487_, Po
122122
GL30.glBindVertexArray(currentVAO);
123123
GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, currentArrayBuffer);
124124
GL15.glBindBuffer(GL15.GL_ELEMENT_ARRAY_BUFFER, currentElementArrayBuffer);
125-
RenderedGltfModel.nodeGlobalTransformLookup.clear();
126125
super.render(p_114485_, p_114486_, p_114487_, p_114488_, p_114489_, p_114490_);
127126
}
128127

src/main/java/com/timlee9024/mcgltf/example/ExampleItemRenderer.java renamed to src/main/java/com/modularmods/mcgltf/example/ExampleItemRenderer.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.timlee9024.mcgltf.example;
1+
package com.modularmods.mcgltf.example;
22

33
import java.util.ArrayList;
44
import java.util.List;
@@ -13,12 +13,12 @@
1313
import com.mojang.blaze3d.vertex.PoseStack;
1414
import com.mojang.math.Matrix3f;
1515
import com.mojang.math.Quaternion;
16-
import com.timlee9024.mcgltf.IGltfModelReceiver;
17-
import com.timlee9024.mcgltf.MCglTF;
18-
import com.timlee9024.mcgltf.RenderedGltfModel;
19-
import com.timlee9024.mcgltf.RenderedGltfScene;
20-
import com.timlee9024.mcgltf.animation.GltfAnimationCreator;
21-
import com.timlee9024.mcgltf.animation.InterpolatedChannel;
16+
import com.modularmods.mcgltf.IGltfModelReceiver;
17+
import com.modularmods.mcgltf.MCglTF;
18+
import com.modularmods.mcgltf.RenderedGltfModel;
19+
import com.modularmods.mcgltf.RenderedGltfScene;
20+
import com.modularmods.mcgltf.animation.GltfAnimationCreator;
21+
import com.modularmods.mcgltf.animation.InterpolatedChannel;
2222

2323
import de.javagl.jgltf.model.AnimationModel;
2424
import net.fabricmc.fabric.api.client.rendering.v1.BuiltinItemRendererRegistry;
@@ -192,7 +192,6 @@ public void render(ItemStack stack, ItemTransforms.TransformType mode, PoseStack
192192
GL30.glBindVertexArray(currentVAO);
193193
GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, currentArrayBuffer);
194194
GL15.glBindBuffer(GL15.GL_ELEMENT_ARRAY_BUFFER, currentElementArrayBuffer);
195-
RenderedGltfModel.nodeGlobalTransformLookup.clear();
196195
}
197196

198197
}

0 commit comments

Comments
 (0)