From 7b3a61d7637fabb74de1250ed1af82bbce2526d2 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 5 Dec 2019 14:03:01 +0000 Subject: [PATCH] 1.15-pre5 --- build.gradle | 2 +- .../net/minecraft/resource/ReloadableResourceManager.mapping | 4 ---- .../minecraft/resource/ReloadableResourceManagerImpl.mapping | 1 + mappings/net/minecraft/resource/ResourceManager.mapping | 2 -- mappings/net/minecraft/util/math/Quaternion.mapping | 3 --- 5 files changed, 2 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 3b7751a697..0e73c810f1 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { id 'maven-publish' } -def minecraft_version = "1.15-pre4" +def minecraft_version = "1.15-pre5" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/net/minecraft/resource/ReloadableResourceManager.mapping b/mappings/net/minecraft/resource/ReloadableResourceManager.mapping index 6fdb5c7380..cba3e427ee 100644 --- a/mappings/net/minecraft/resource/ReloadableResourceManager.mapping +++ b/mappings/net/minecraft/resource/ReloadableResourceManager.mapping @@ -6,10 +6,6 @@ CLASS net/minecraft/class_3296 net/minecraft/resource/ReloadableResourceManager ARG 2 applyExecutor ARG 3 packs ARG 4 initialStage - METHOD method_18230 beginInitialMonitoredReload (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_4011; - ARG 1 prepareExecutor - ARG 2 applyExecutor - ARG 3 initialStage METHOD method_18232 beginMonitoredReload (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;Ljava/util/List;)Lnet/minecraft/class_4011; ARG 1 prepareExecutor ARG 2 applyExecutor diff --git a/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping b/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping index a0217a27c5..8da602b886 100644 --- a/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping +++ b/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_3304 net/minecraft/resource/ReloadableResourceManagerI METHOD (Lnet/minecraft/class_3264;Ljava/lang/Thread;)V ARG 1 type ARG 2 mainThread + METHOD method_14475 addPack (Lnet/minecraft/class_3262;)V METHOD method_14495 clear ()V METHOD method_18240 beginReloadInner (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_4011; ARG 1 prepareExecutor diff --git a/mappings/net/minecraft/resource/ResourceManager.mapping b/mappings/net/minecraft/resource/ResourceManager.mapping index e772741942..fae852d196 100644 --- a/mappings/net/minecraft/resource/ResourceManager.mapping +++ b/mappings/net/minecraft/resource/ResourceManager.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_3300 net/minecraft/resource/ResourceManager - METHOD method_14475 addPack (Lnet/minecraft/class_3262;)V - ARG 1 pack METHOD method_14486 getResource (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3298; ARG 1 id METHOD method_14487 getAllNamespaces ()Ljava/util/Set; diff --git a/mappings/net/minecraft/util/math/Quaternion.mapping b/mappings/net/minecraft/util/math/Quaternion.mapping index 2090e966c3..9f7d02a813 100644 --- a/mappings/net/minecraft/util/math/Quaternion.mapping +++ b/mappings/net/minecraft/util/math/Quaternion.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_1158 net/minecraft/util/math/Quaternion FIELD field_21493 IDENTITY Lnet/minecraft/class_1158; - FIELD field_21582 b F - FIELD field_21583 c F - FIELD field_21584 d F FIELD field_21585 a F METHOD (FFFF)V ARG 1 b