Uplandustries/Eaglercraft-1.8
1
0
Fork 0
mirror of https://github.com/Eaglercraft-Archive/Eaglercraftx-1.8.8-src.git synced 2025-07-16 04:09:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update #18 - Final release, added PBR shaders

Browse Source
This commit is contained in:
LAX1DUDE
2023-04-07 16:48:33 -07:00
parent af6d2ffc18
commit b2274a25b0
497 changed files with 28342 additions and 1014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
patches/minecraft/net/minecraft/client/resources/model/ModelBakery.edit.java
View File

@ -7,13 +7,13 @@
> DELETE 2 @ 2 : 8
> INSERT 6 : 7 @ 6
> CHANGE 4 : 5 @ 4 : 7
+ import java.nio.charset.StandardCharsets;
~ import java.nio.charset.StandardCharsets;
> DELETE 8 @ 8 : 9
> DELETE 7 @ 7 : 8
> INSERT 1 : 13 @ 1
> INSERT 1 : 17 @ 1
+ import java.util.Set;
+
@ -27,6 +27,10 @@
+ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
+ import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.BlockVertexIDs;
+ import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.VertexMarkerState;
+ import net.minecraft.client.Minecraft;
> DELETE 9 @ 9 : 10
@ -87,7 +91,39 @@
~ + Item.itemRegistry.getNameForObject(item) + "\'");
~ LOGGER.warn(exception);
> CHANGE 188 : 189 @ 188 : 189
> INSERT 132 : 133 @ 132
+ boolean deferred = Minecraft.getMinecraft().gameSettings.shaders;
> INSERT 9 : 34 @ 9
+ if (deferred) {
+ ModelBlock currentBlockModel = modelblock;
+ ResourceLocation currentResourceLocation = modelblockdefinition$variant.getModelLocation();
+ Integer blockId = null;
+ do {
+ blockId = BlockVertexIDs.modelToID.get(currentResourceLocation.toString());
+ if (blockId != null) {
+ break;
+ }
+ currentResourceLocation = currentBlockModel.getParentLocation();
+ currentBlockModel = models.get(currentResourceLocation);
+ } while (currentBlockModel != null);
+ if (blockId != null) {
+ VertexMarkerState.markId = blockId.intValue();
+ try {
+ weightedbakedmodel$builder.add(
+ this.bakeModel(modelblock, modelblockdefinition$variant.getRotation(),
+ modelblockdefinition$variant.isUvLocked()),
+ modelblockdefinition$variant.getWeight());
+ } finally {
+ VertexMarkerState.markId = 0;
+ }
+ continue;
+ }
+ }
> CHANGE 47 : 48 @ 47 : 48
~ for (ModelResourceLocation modelresourcelocation : (List<ModelResourceLocation>) arraylist) {