keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix default mod resources loosing it's sort order.

Browse source
This commit is contained in:
LexManos 2020-01-29 11:31:31 -08:00
parent 2b43aa6301
commit 40091678a8
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
patches/minecraft/net/minecraft/client/GameSettings.java.patch
View file

@ -38,11 +38,8 @@
} }
for(SoundCategory soundcategory : SoundCategory.values()) { for(SoundCategory soundcategory : SoundCategory.values()) {
@@ -712,6 +718,25 @@ @@ -714,4 +720,22 @@
}
}
+ if (net.minecraftforge.fml.client.ClientModLoader.isLoading()) return; //Don't save settings before mods add keybindigns and the like to prevent them from being deleted.
p_198017_1_.func_198985_a(set); p_198017_1_.func_198985_a(set);
} }
+ +

7
patches/minecraft/net/minecraft/client/Minecraft.java.patch
View file

@ -24,7 +24,7 @@
Util.field_211180_a = RenderSystem.initBackendSystem(); Util.field_211180_a = RenderSystem.initBackendSystem();
this.field_195557_T = new VirtualScreen(this); this.field_195557_T = new VirtualScreen(this);
this.field_195558_d = this.field_195557_T.func_217626_a(screensize, this.field_71474_y.field_198019_u, this.func_230149_ax_()); this.field_195558_d = this.field_195557_T.func_217626_a(screensize, this.field_71474_y.field_198019_u, this.func_230149_ax_());
@@ -383,7 +384,6 @@ @@ -383,13 +384,13 @@
this.field_195558_d.func_216526_a(this.field_71474_y.field_74350_i); this.field_195558_d.func_216526_a(this.field_71474_y.field_74350_i);
this.field_71417_B = new MouseHelper(this); this.field_71417_B = new MouseHelper(this);
@ -32,14 +32,13 @@
this.field_195559_v = new KeyboardListener(this); this.field_195559_v = new KeyboardListener(this);
this.field_195559_v.func_197968_a(this.field_195558_d.func_198092_i()); this.field_195559_v.func_197968_a(this.field_195558_d.func_198092_i());
RenderSystem.initRenderer(this.field_71474_y.field_209231_W, false); RenderSystem.initRenderer(this.field_71474_y.field_209231_W, false);
@@ -391,6 +391,7 @@ this.field_147124_at = new Framebuffer(this.field_195558_d.func_198109_k(), this.field_195558_d.func_198091_l(), true, field_142025_a);
this.field_147124_at.func_147604_a(0.0F, 0.0F, 0.0F, 0.0F); this.field_147124_at.func_147604_a(0.0F, 0.0F, 0.0F, 0.0F);
this.field_110451_am = new SimpleReloadableResourceManager(ResourcePackType.CLIENT_RESOURCES, this.field_152352_aC); this.field_110451_am = new SimpleReloadableResourceManager(ResourcePackType.CLIENT_RESOURCES, this.field_152352_aC);
this.field_71474_y.func_198017_a(this.field_110448_aq);
+ net.minecraftforge.fml.client.ClientModLoader.begin(this, this.field_110448_aq, this.field_110451_am, this.field_195554_ax); + net.minecraftforge.fml.client.ClientModLoader.begin(this, this.field_110448_aq, this.field_110451_am, this.field_195554_ax);
this.field_71474_y.func_198017_a(this.field_110448_aq);
this.field_110448_aq.func_198983_a(); this.field_110448_aq.func_198983_a();
this.field_135017_as = new LanguageManager(this.field_71474_y.field_74363_ab); this.field_135017_as = new LanguageManager(this.field_71474_y.field_74363_ab);
this.field_110451_am.func_219534_a(this.field_135017_as);
@@ -434,12 +435,14 @@ @@ -434,12 +435,14 @@
this.func_193986_ar(); this.func_193986_ar();
this.field_110451_am.func_219534_a(this.field_193995_ae); this.field_110451_am.func_219534_a(this.field_193995_ae);

2
src/main/java/net/minecraftforge/fml/client/ClientModLoader.java
View file

@ -211,7 +211,7 @@ public class ClientModLoader
} }
} }
final T packInfo = ResourcePackInfo.createResourcePack("mod_resources", true, () -> new DelegatingResourcePack("mod_resources", "Mod Resources", final T packInfo = ResourcePackInfo.createResourcePack("mod_resources", true, () -> new DelegatingResourcePack("mod_resources", "Mod Resources",
new PackMetadataSection(new TranslationTextComponent("fml.resources.modresources", hiddenPacks.size()), 4), new PackMetadataSection(new TranslationTextComponent("fml.resources.modresources", hiddenPacks.size()), 5),
hiddenPacks), factory, ResourcePackInfo.Priority.BOTTOM); hiddenPacks), factory, ResourcePackInfo.Priority.BOTTOM);
packList.put("mod_resources", packInfo); packList.put("mod_resources", packInfo);
} }