diff --git a/build.gradle b/build.gradle index 5925b4c05c..6b0e1d7751 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { id 'maven-publish' } -def minecraft_version = "1.14 Pre-Release 5" +def minecraft_version = "1.14" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/net/minecraft/block/BedBlock.mapping b/mappings/net/minecraft/block/BedBlock.mapping index 0cd6987ba8..2127e6aa7d 100644 --- a/mappings/net/minecraft/block/BedBlock.mapping +++ b/mappings/net/minecraft/block/BedBlock.mapping @@ -11,17 +11,12 @@ CLASS bmg net/minecraft/block/BedBlock FIELD j WEST_SHAPE Lcsp; FIELD k EAST_SHAPE Lcsp; FIELD w color Lbax; + METHOD a canWakeUpAt (Laij;Lbhk;Lev;)Ljava/util/Optional; + METHOD a findWakeUpPosition (Laij;Lbhk;Lev;I)Ljava/util/Optional; METHOD a getDirection (Lbgr;Lev;)Lfa; ARG 0 world ARG 1 pos - METHOD a findWakeUpPosition (Lbgr;Lev;I)Lev; - ARG 0 world - ARG 1 pos - ARG 2 ordinal METHOD a getDirectionTowardsOtherPart (Lbvy;Lfa;)Lfa; ARG 0 part ARG 1 direction - METHOD b canWakeUpAt (Lbgr;Lev;)Z - ARG 0 world - ARG 1 pos METHOD d getColor ()Lbax; diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index 1c94dab218..21a27b0dc1 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -48,7 +48,6 @@ CLASS cwk net/minecraft/client/gui/widget/EntryListWidget METHOD getEntryAtPosition (DD)Lcwk$a; ARG 1 x ARG 3 y - METHOD getMaxPosition getMaxPosition ()I METHOD getRowTop (I)I ARG 1 index METHOD isMouseOver (DD)Z diff --git a/mappings/net/minecraft/client/particle/SpellParticle.mapping b/mappings/net/minecraft/client/particle/SpellParticle.mapping index e98584b9dd..9bc7bf9596 100644 --- a/mappings/net/minecraft/client/particle/SpellParticle.mapping +++ b/mappings/net/minecraft/client/particle/SpellParticle.mapping @@ -1,7 +1,7 @@ CLASS djd net/minecraft/client/particle/SpellParticle CLASS djd$a EntityAmbientFactory - CLASS djd$b DefaultFactory + CLASS djd$b InstantFactory CLASS djd$c EntityFactory - CLASS djd$d InstantFactory + CLASS djd$d DefaultFactory CLASS djd$e WitchFactory FIELD C RANDOM Ljava/util/Random; diff --git a/mappings/net/minecraft/recipe/RecipeFinder.mapping b/mappings/net/minecraft/recipe/RecipeFinder.mapping index c7092473e8..ac3936da82 100644 --- a/mappings/net/minecraft/recipe/RecipeFinder.mapping +++ b/mappings/net/minecraft/recipe/RecipeFinder.mapping @@ -32,7 +32,6 @@ CLASS avz net/minecraft/recipe/RecipeFinder ARG 1 id ARG 2 amount METHOD b addItem (Lbca;)V - ARG 1 stack METHOD b countRecipeCrafts (Lbei;Lit/unimi/dsi/fastutil/ints/IntList;)I ARG 2 outMatchingInputIds METHOD c getItemId (Lbca;)I diff --git a/mappings/net/minecraft/structure/JungleTempleGenerator.mapping b/mappings/net/minecraft/structure/JungleTempleGenerator.mapping index 3f451523ad..05227b3618 100644 --- a/mappings/net/minecraft/structure/JungleTempleGenerator.mapping +++ b/mappings/net/minecraft/structure/JungleTempleGenerator.mapping @@ -1,8 +1,5 @@ CLASS chw net/minecraft/structure/JungleTempleGenerator CLASS chw$a CobblestoneRandomizer - METHOD a (Ljava/util/Random;IIIZ)V - ARG 1 random - ARG 2 x FIELD e placedMainChest Z FIELD f placedHiddenChest Z FIELD g placedTrap1 Z diff --git a/mappings/net/minecraft/structure/MineshaftGenerator.mapping b/mappings/net/minecraft/structure/MineshaftGenerator.mapping index 632eea9607..2cebc7a97a 100644 --- a/mappings/net/minecraft/structure/MineshaftGenerator.mapping +++ b/mappings/net/minecraft/structure/MineshaftGenerator.mapping @@ -4,8 +4,6 @@ CLASS chy net/minecraft/structure/MineshaftGenerator FIELD c hasCobwebs Z FIELD d hasSpawner Z FIELD e length I - METHOD a (Lbhi;Lchr;Ljava/util/Random;IIILqs;)Z - ARG 3 random CLASS chy$b MineshaftCrossing FIELD b direction Lfa; FIELD c twoFloors Z diff --git a/mappings/net/minecraft/structure/StrongholdGenerator.mapping b/mappings/net/minecraft/structure/StrongholdGenerator.mapping index bfee35bf9e..82d07d0590 100644 --- a/mappings/net/minecraft/structure/StrongholdGenerator.mapping +++ b/mappings/net/minecraft/structure/StrongholdGenerator.mapping @@ -18,9 +18,6 @@ CLASS cih net/minecraft/structure/StrongholdGenerator CLASS cih$j SquareRoom FIELD a roomType I CLASS cih$k StoneBrickRandomizer - METHOD a (Ljava/util/Random;IIIZ)V - ARG 1 random - ARG 2 x CLASS cih$l SpiralStaircase FIELD a isStructureStart Z CLASS cih$m Start diff --git a/mappings/net/minecraft/util/math/ColumnPos.mapping b/mappings/net/minecraft/util/math/ColumnPos.mapping index 74afc6d7a8..8ea616558a 100644 --- a/mappings/net/minecraft/util/math/ColumnPos.mapping +++ b/mappings/net/minecraft/util/math/ColumnPos.mapping @@ -6,7 +6,6 @@ CLASS uw net/minecraft/util/math/ColumnPos ARG 2 z METHOD (Lev;)V ARG 1 pos - METHOD a getChunkPos ()Lbgt; METHOD a toLong (II)J ARG 0 x ARG 1 z diff --git a/mappings/net/minecraft/util/math/Direction.mapping b/mappings/net/minecraft/util/math/Direction.mapping index 09b15f3a81..566def2570 100644 --- a/mappings/net/minecraft/util/math/Direction.mapping +++ b/mappings/net/minecraft/util/math/Direction.mapping @@ -76,9 +76,9 @@ CLASS fa net/minecraft/util/math/Direction ARG 2 z METHOD a byId (I)Lfa; ARG 0 id + METHOD a fromVector (III)Lfa; METHOD a getEntityFacingOrder (Laif;)[Lfa; ARG 0 entity - METHOD a fromVector (Lev;)Lfa; METHOD a rotateClockwise (Lfa$a;)Lfa; METHOD a from (Lfa$a;Lfa$b;)Lfa; ARG 0 axis diff --git a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping index 127b8916f0..00ac0b4778 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping @@ -3,9 +3,6 @@ CLASS ckn net/minecraft/world/chunk/light/ChunkLightProvider FIELD b type Lbhq; FIELD c lightStorage Lckp; FIELD d DIRECTIONS [Lfa; - FIELD f srcMutablePos Lev$a; - FIELD g destMutablePos Lev$a; - FIELD h mutablePosGetLightBlockedBetween Lev$a; METHOD (Lbxl;Lbhq;Lckp;)V ARG 1 chunkProvider ARG 2 type @@ -16,9 +13,6 @@ CLASS ckn net/minecraft/world/chunk/light/ChunkLightProvider ARG 2 chunkZ METHOD a doLightUpdates (IZZ)I ARG 1 stepCount - METHOD a getLightBlockedBetween (JJ)I - ARG 1 src - ARG 3 dest METHOD a setSection (JLbxd;)V METHOD a getCurrentLevelFromArray (Lbxd;J)I ARG 1 array