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

Made future ECR diff commits even more preview friendly

Browse Source
This commit is contained in:
LAX1DUDE
2022-12-30 03:58:10 -08:00
parent 2f42cc9fb6
commit 7759d27cc2
699 changed files with 3755 additions and 3753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,13 +7,13 @@
> DELETE 2 @ 2 : 8
> INSERT 6 : 7 @ 12
> INSERT 6 : 7 @ 6
+ import java.nio.charset.StandardCharsets;
> DELETE 9 @ 8 : 9
> DELETE 8 @ 8 : 9
> INSERT 1 : 13 @ 2
> INSERT 1 : 13 @ 1
+ import java.util.Set;
+
@ -28,108 +28,108 @@
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
> DELETE 21 @ 9 : 10
> DELETE 9 @ 9 : 10
> DELETE 3 @ 4 : 10
> DELETE 3 @ 3 : 9
> DELETE 7 @ 13 : 16
> DELETE 7 @ 7 : 10
> CHANGE 20 : 21 @ 23 : 24
> CHANGE 20 : 21 @ 20 : 21
~ private final Map<ResourceLocation, EaglerTextureAtlasSprite> sprites = Maps.newHashMap();
> INSERT 61 : 62 @ 61
> INSERT 60 : 61 @ 60
+ LOGGER.warn(var6);
> CHANGE 3 : 5 @ 2 : 3
> CHANGE 2 : 4 @ 2 : 3
~ LOGGER.warn("Unable to load definition " + modelresourcelocation);
~ LOGGER.warn(exception);
> CHANGE 41 : 42 @ 40 : 41
> CHANGE 39 : 40 @ 39 : 40
~ modelblockdefinition = new ModelBlockDefinition((ArrayList<ModelBlockDefinition>) arraylist);
> CHANGE 23 : 25 @ 23 : 24
> CHANGE 22 : 24 @ 22 : 23
~ + modelresourcelocation + "\'");
~ LOGGER.warn(exception);
> CHANGE 20 : 21 @ 19 : 20
> CHANGE 18 : 19 @ 18 : 19
~ String str;
> CHANGE 3 : 5 @ 3 : 5
> CHANGE 2 : 4 @ 2 : 4
~ str = (String) BUILT_IN_MODELS.get(s1);
~ if (str == null) {
> DELETE 4 @ 4 : 6
> DELETE 2 @ 2 : 4
> CHANGE 2 : 5 @ 4 : 5
> CHANGE 2 : 5 @ 2 : 3
~ try (InputStream is = iresource.getInputStream()) {
~ str = IOUtils.inputStreamToString(is, StandardCharsets.UTF_8);
~ }
> CHANGE 5 : 7 @ 3 : 11
> CHANGE 2 : 4 @ 2 : 10
~ ModelBlock modelblock = ModelBlock.deserialize(str);
~ modelblock.name = parResourceLocation.toString();
> CHANGE 3 : 4 @ 9 : 10
> CHANGE 1 : 2 @ 1 : 2
~ return modelblock;
> CHANGE 22 : 24 @ 22 : 23
> CHANGE 21 : 23 @ 21 : 22
~ + Item.itemRegistry.getNameForObject(item) + "\'");
~ LOGGER.warn(exception);
> CHANGE 190 : 191 @ 189 : 190
> CHANGE 188 : 189 @ 188 : 189
~ for (ModelResourceLocation modelresourcelocation : (List<ModelResourceLocation>) arraylist) {
> CHANGE 20 : 21 @ 20 : 21
> CHANGE 19 : 20 @ 19 : 20
~ EaglerTextureAtlasSprite textureatlassprite = (EaglerTextureAtlasSprite) this.sprites
> CHANGE 8 : 9 @ 8 : 9
> CHANGE 7 : 8 @ 7 : 8
~ EaglerTextureAtlasSprite textureatlassprite1 = (EaglerTextureAtlasSprite) this.sprites
> CHANGE 17 : 18 @ 17 : 18
> CHANGE 16 : 17 @ 16 : 17
~ EaglerTextureAtlasSprite parTextureAtlasSprite, EnumFacing parEnumFacing, ModelRotation parModelRotation,
> CHANGE 18 : 19 @ 18 : 19
> CHANGE 17 : 18 @ 17 : 18
~ List arraydeque = Lists.newLinkedList();
> CHANGE 12 : 13 @ 12 : 13
> CHANGE 11 : 12 @ 11 : 12
~ ResourceLocation resourcelocation2 = (ResourceLocation) arraydeque.remove(0);
> CHANGE 15 : 17 @ 15 : 16
> CHANGE 14 : 16 @ 14 : 15
~ + "; unable to load model: \'" + resourcelocation2 + "\'");
~ LOGGER.warn(exception);
> CHANGE 52 : 54 @ 51 : 53
> CHANGE 50 : 52 @ 50 : 52
~ for (ResourceLocation resourcelocation : (Set<ResourceLocation>) set) {
~ EaglerTextureAtlasSprite textureatlassprite = texturemap.registerSprite(resourcelocation);
> CHANGE 23 : 24 @ 23 : 24
> CHANGE 21 : 22 @ 21 : 22
~ EaglerTextureAtlasSprite.setLocationNameCompass(resourcelocation2.toString());
> CHANGE 3 : 4 @ 3 : 4
> CHANGE 2 : 3 @ 2 : 3
~ EaglerTextureAtlasSprite.setLocationNameClock(resourcelocation2.toString());
> CHANGE 53 : 54 @ 53 : 54
> CHANGE 52 : 53 @ 52 : 53
~ for (EaglerTextureAtlasSprite textureatlassprite : this.sprites.values()) {