diff --git a/build.gradle b/build.gradle index 0271e7979b..c4b4064f25 100644 --- a/build.gradle +++ b/build.gradle @@ -59,8 +59,8 @@ ext { } MAPPING_CHANNEL = 'snapshot' MAPPING_VERSION = '20190719-1.14.3' - MC_VERSION = '1.15' - MCP_VERSION = '20191212.203412' + MC_VERSION = '1.15.1' + MCP_VERSION = '20191217.105819' } project(':mcp') { diff --git a/mdk/src/main/resources/META-INF/mods.toml b/mdk/src/main/resources/META-INF/mods.toml index 23aa1e7a28..a38b28b8c5 100644 --- a/mdk/src/main/resources/META-INF/mods.toml +++ b/mdk/src/main/resources/META-INF/mods.toml @@ -6,7 +6,7 @@ # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml modLoader="javafml" #mandatory # A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion="[28,)" #mandatory (28 is current forge version) +loaderVersion="[30,)" #mandatory (28 is current forge version) # A URL to refer people to when problems occur with this mod issueTrackerURL="http://my.issue.tracker/" #optional # A list of mods - how many allowed here is determined by the individual mod loader @@ -42,7 +42,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magn # Does this dependency have to exist - if not, ordering below must be specified mandatory=true #mandatory # The version range of the dependency - versionRange="[28,)" #mandatory + versionRange="[30,)" #mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory ordering="NONE" # Side this dependency is applied on - BOTH, CLIENT or SERVER @@ -51,6 +51,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magn [[dependencies.examplemod]] modId="minecraft" mandatory=true - versionRange="[1.14.4]" + versionRange="[1.15.1]" ordering="NONE" side="BOTH" diff --git a/mdk/src/main/resources/pack.mcmeta b/mdk/src/main/resources/pack.mcmeta index 42ab490515..700e07e436 100644 --- a/mdk/src/main/resources/pack.mcmeta +++ b/mdk/src/main/resources/pack.mcmeta @@ -1,7 +1,7 @@ { "pack": { "description": "examplemod resources", - "pack_format": 4, - "_comment": "A pack_format of 4 requires json lang files. Note: we require v4 pack meta for all mods." + "pack_format": 5, + "_comment": "A pack_format of 5 requires json lang files and some texture changes from 1.15. Note: we require v5 pack meta for all mods." } } diff --git a/patches/minecraft/net/minecraft/entity/merchant/villager/VillagerEntity.java.patch b/patches/minecraft/net/minecraft/entity/merchant/villager/VillagerEntity.java.patch index 71e4748191..b387ba622e 100644 --- a/patches/minecraft/net/minecraft/entity/merchant/villager/VillagerEntity.java.patch +++ b/patches/minecraft/net/minecraft/entity/merchant/villager/VillagerEntity.java.patch @@ -9,7 +9,7 @@ if (this.func_70631_g_()) { this.func_213756_es(); return super.func_184645_a(p_184645_1_, p_184645_2_); -@@ -604,7 +604,8 @@ +@@ -607,7 +607,8 @@ } protected ITextComponent func_225513_by_() { diff --git a/patches/minecraft/net/minecraft/item/ItemStack.java.patch b/patches/minecraft/net/minecraft/item/ItemStack.java.patch index 343e52451c..9a155ff51b 100644 --- a/patches/minecraft/net/minecraft/item/ItemStack.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemStack.java.patch @@ -190,7 +190,7 @@ } } -@@ -648,6 +671,7 @@ +@@ -652,6 +675,7 @@ } } @@ -198,7 +198,7 @@ return list; } -@@ -768,7 +792,7 @@ +@@ -772,7 +796,7 @@ } } } else { @@ -207,7 +207,7 @@ } multimap.values().forEach((p_226631_0_) -> { -@@ -911,6 +935,35 @@ +@@ -915,6 +939,35 @@ return this.func_77973_b().func_219971_r(); } diff --git a/patches/minecraft/net/minecraft/world/server/ChunkManager.java.patch b/patches/minecraft/net/minecraft/world/server/ChunkManager.java.patch index 2505b46861..74ce89349c 100644 --- a/patches/minecraft/net/minecraft/world/server/ChunkManager.java.patch +++ b/patches/minecraft/net/minecraft/world/server/ChunkManager.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/server/ChunkManager.java +++ b/net/minecraft/world/server/ChunkManager.java -@@ -364,6 +364,7 @@ +@@ -368,6 +368,7 @@ iprofiler.func_219895_b("chunk_unload"); if (!this.field_219255_i.func_217402_u()) { this.func_223155_b(p_219204_1_); @@ -8,7 +8,7 @@ } iprofiler.func_76319_b(); -@@ -400,6 +401,7 @@ +@@ -404,6 +405,7 @@ if (this.field_219253_g.remove(p_219212_1_, p_219212_3_) && p_219185_5_ != null) { if (p_219185_5_ instanceof Chunk) { ((Chunk)p_219185_5_).func_177417_c(false); @@ -16,7 +16,7 @@ } this.func_219229_a(p_219185_5_); -@@ -477,6 +479,7 @@ +@@ -481,6 +483,7 @@ if (flag) { IChunk ichunk = ChunkSerializer.func_222656_a(this.field_219255_i, this.field_219269_w, this.field_219260_n, p_223172_1_, compoundnbt); ichunk.func_177432_b(this.field_219255_i.func_82737_E()); @@ -24,7 +24,7 @@ return Either.left(ichunk); } -@@ -586,6 +589,7 @@ +@@ -590,6 +593,7 @@ if (list != null) { list.forEach(chunk::func_76622_b); } @@ -32,7 +32,7 @@ } return chunk; -@@ -670,6 +674,7 @@ +@@ -674,6 +678,7 @@ } CompoundNBT compoundnbt1 = ChunkSerializer.func_222645_a(this.field_219255_i, p_219229_1_); @@ -40,7 +40,7 @@ this.func_219100_a(chunkpos, compoundnbt1); return true; } catch (Exception exception) { -@@ -806,6 +811,7 @@ +@@ -810,6 +815,7 @@ for(int l = i - this.field_219247_A; l <= i + this.field_219247_A; ++l) { for(int k = j - this.field_219247_A; k <= j + this.field_219247_A; ++k) { ChunkPos chunkpos = new ChunkPos(l, k); diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index d02cfbd9e0..b482eeaa33 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -40,8 +40,10 @@ public net.minecraft.client.renderer.model.BlockModel func_187966_f()Ljava/util/ public net.minecraft.client.renderer.model.BlockPart func_178236_a(Lnet/minecraft/util/Direction;)[F # getFaceUvs public net.minecraft.client.renderer.model.BlockPart$Deserializer ()V public net.minecraft.client.renderer.model.BlockPartFace$Deserializer ()V +public net.minecraft.client.renderer.model.ItemCameraTransforms$Deserializer ()V public net.minecraft.client.renderer.model.ItemOverride$Deserializer ()V protected net.minecraft.client.renderer.model.ItemOverrideList ()V +public net.minecraft.client.renderer.model.ItemTransformVec3f$Deserializer ()V public net.minecraft.client.renderer.model.ItemTransformVec3f$Deserializer field_178360_b # TRANSLATION_DEFAULT public net.minecraft.client.renderer.model.ItemTransformVec3f$Deserializer field_178361_c # SCALE_DEFAULT public net.minecraft.client.renderer.model.ItemTransformVec3f$Deserializer field_178362_a # ROTATION_DEFAULT