mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

1.16_combat-3

This commit is contained in:
modmuss50 2020-08-15 11:15:05 +01:00
parent ac72028f79
commit 98028e50dc
23 changed files with 21 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
build.gradle
View File

@ -23,7 +23,10 @@ plugins {
id 'java' // for jd gen
}
def minecraft_version = "1.16.2"
def minecraft_version = "1.16_combat-3"
//Used as this is an experimental build.
def version_manifest_url = "https://gist.githubusercontent.com/modmuss50/5ce466e1937b62cefcfe7af776fb6d05/raw/76625758c964c39613c2481555da058fc5948eca/1.16_combat_3.json";
def ENV = System.getenv()
// Fetch build number from Jenkins
@ -112,18 +115,6 @@ boolean validateChecksum(File file, String checksum) {
return false
}
task downloadVersionsManifest {
group = setupGroup
//inputs.property "mc_ver", minecraft_version
inputs.property "currenttime", new Date()
def manifestFile = new File(cacheFilesMinecraft, "version_manifest.json")
outputs.file(manifestFile)
doLast {
logger.lifecycle(":downloading minecraft versions manifest")
FileUtils.copyURLToFile(new URL("https://launchermeta.mojang.com/mc/game/version_manifest.json"), manifestFile)
}
}
def getManifestVersion(File manifestFile, String minecraft_version) {
def manifest = manifestFile.exists() ? new JsonSlurper().parseText(FileUtils.readFileToString(manifestFile)) : null
return manifest != null ? manifest.versions.stream().filter({
@ -131,29 +122,13 @@ def getManifestVersion(File manifestFile, String minecraft_version) {
}).findFirst() : java.util.Optional.empty()
}
task downloadWantedVersionManifest(dependsOn: downloadVersionsManifest) {
task downloadWantedVersionManifest() {
group = setupGroup
def manifestFile = downloadVersionsManifest.outputs.files.singleFile
def manifestVersion = getManifestVersion(manifestFile, minecraft_version)
//have to grab the release time as there's a current timestamp on each element?!
inputs.property "releaseTime", manifestVersion.isPresent() ? manifestVersion.get().releaseTime : -1
outputs.file versionFile
doLast {
manifestVersion = getManifestVersion(manifestFile, minecraft_version)
//nb need to re-read here in case it didn't exist before
if (manifestVersion.isPresent() || versionFile.exists()) {
if (manifestVersion.isPresent()) {
FileUtils.copyURLToFile(new URL(manifestVersion.get().url), versionFile)
}
} else {
throw new RuntimeException("No version data for Minecraft version ${minecraft_version}")
}
FileUtils.copyURLToFile(new URL(version_manifest_url), versionFile)
}
}
task downloadMcJars(dependsOn: downloadWantedVersionManifest) {

2
mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping
View File

@ -5,7 +5,7 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior
ARG 2 stack
METHOD method_16812 doDispense (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;
METHOD method_18346 registerDefaults ()V
CLASS 17
CLASS 18
METHOD method_22141 (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;
ARG 2 emptyBottleStack
ARG 3 filledBottleStack

2
mappings/net/minecraft/client/input/Input.mapping
View File

@ -9,5 +9,5 @@ CLASS net/minecraft/class_744 net/minecraft/client/input/Input
FIELD field_3910 pressingForward Z
METHOD method_20622 hasForwardMovement ()Z
METHOD method_3128 getMovementInput ()Lnet/minecraft/class_241;
METHOD method_3129 tick (Z)V
METHOD method_3129 tick (ZZ)V
ARG 1 slowDown

1
mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping
View File

@ -98,7 +98,6 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti
METHOD method_2923 isBreakingBlock ()Z
METHOD method_2924 hasLimitedAttackSpeed ()Z
METHOD method_2925 cancelBlockBreaking ()V
METHOD method_2926 hasExtendedReach ()Z
METHOD method_2927 tick ()V
METHOD method_2928 isFlyingLocked ()Z
METHOD method_29357 createPlayer (Lnet/minecraft/class_638;Lnet/minecraft/class_3469;Lnet/minecraft/class_299;)Lnet/minecraft/class_746;

2
mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping
View File

@ -8,7 +8,7 @@ CLASS net/minecraft/class_1007 net/minecraft/client/render/entity/PlayerEntityRe
ARG 4 player
ARG 5 arm
ARG 6 sleeve
METHOD method_4210 getArmPose (Lnet/minecraft/class_742;Lnet/minecraft/class_1268;)Lnet/minecraft/class_572$class_573;
METHOD method_4210 getArmPose (Lnet/minecraft/class_742;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;)Lnet/minecraft/class_572$class_573;
METHOD method_4218 setModelPose (Lnet/minecraft/class_742;)V
METHOD method_4220 renderRightArm (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_742;)V
ARG 1 matrices

11
mappings/net/minecraft/client/world/ClientWorld.mapping
View File

@ -11,17 +11,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld
FIELD field_3727 netHandler Lnet/minecraft/class_634;
FIELD field_3729 client Lnet/minecraft/class_310;
FIELD field_3733 scoreboard Lnet/minecraft/class_269;
METHOD <init> (Lnet/minecraft/class_634;Lnet/minecraft/class_638$class_5271;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_2874;ILjava/util/function/Supplier;Lnet/minecraft/class_761;ZJ)V
ARG 1 networkHandler
ARG 2 properties
ARG 3 worldRef
ARG 4 dimensionRef
ARG 5 dimensionType
ARG 6 loadDistance
ARG 7 profiler
ARG 8 worldRenderer
ARG 9 debugWorld
ARG 10 seed
METHOD method_18107 addPlayer (ILnet/minecraft/class_742;)V
ARG 1 id
ARG 2 player

5
mappings/net/minecraft/enchantment/Enchantment.mapping
View File

@ -48,13 +48,12 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment
METHOD method_8190 getOrCreateTranslationKey ()Ljava/lang/String;
METHOD method_8191 byRawId (I)Lnet/minecraft/class_1887;
ARG 0 id
METHOD method_8192 isAcceptableItem (Lnet/minecraft/class_1799;)Z
METHOD method_8192 isAcceptableItem (Lnet/minecraft/class_1799;Z)Z
ARG 1 stack
METHOD method_8193 isTreasure ()Z
METHOD method_8195 isCursed ()Z
METHOD method_8196 getAttackDamage (ILnet/minecraft/class_1310;)F
METHOD method_8196 getAttackDamage (ILnet/minecraft/class_1309;)F
ARG 1 level
ARG 2 group
CLASS class_1888 Rarity
COMMENT The rarity is an attribute of an enchantment.
COMMENT

3
mappings/net/minecraft/enchantment/EnchantmentHelper.mapping
View File

@ -80,9 +80,8 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper
ARG 0 entity
METHOD method_8217 getSweepingMultiplier (Lnet/minecraft/class_1309;)F
ARG 0 entity
METHOD method_8218 getAttackDamage (Lnet/minecraft/class_1799;Lnet/minecraft/class_1310;)F
METHOD method_8218 getAttackDamage (Lnet/minecraft/class_1799;Lnet/minecraft/class_1309;)F
ARG 0 stack
ARG 1 group
METHOD method_8219 getProtectionAmount (Ljava/lang/Iterable;Lnet/minecraft/class_1282;)I
ARG 0 equipment
ARG 1 source

2
mappings/net/minecraft/enchantment/EnchantmentTarget.mapping
View File

@ -1,3 +1,3 @@
CLASS net/minecraft/class_1886 net/minecraft/enchantment/EnchantmentTarget
METHOD method_8177 isAcceptableItem (Lnet/minecraft/class_1792;)Z
METHOD method_8177 isAcceptableItem (Lnet/minecraft/class_1792;Z)Z
ARG 1 item

2
mappings/net/minecraft/entity/LivingEntity.mapping
View File

@ -423,3 +423,5 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
METHOD method_6132 applyArmorToDamage (Lnet/minecraft/class_1282;F)F
ARG 1 source
ARG 2 amount
METHOD method_7261 getAttackCooldownProgress (F)F
METHOD method_7284 disableShield (F)Z

2
mappings/net/minecraft/entity/damage/DamageSource.mapping
View File

@ -83,7 +83,7 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource
METHOD method_5530 isSourceCreativePlayer ()Z
METHOD method_5531 explosion (Lnet/minecraft/class_1927;)Lnet/minecraft/class_1282;
ARG 0 explosion
METHOD method_5532 player (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1282;
METHOD method_5532 player (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1285;
ARG 0 attacker
METHOD method_5533 isProjectile ()Z
METHOD method_5534 isFire ()Z

4
mappings/net/minecraft/entity/mob/MobEntity.mapping
View File

@ -54,10 +54,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
METHOD method_20820 canGather (Lnet/minecraft/class_1799;)Z
ARG 1 stack
METHOD method_23734 isDisallowedInPeaceful ()Z
METHOD method_24521 disablePlayerShield (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V
ARG 1 player
ARG 2 mobStack
ARG 3 playerStack
METHOD method_24523 tryEquip (Lnet/minecraft/class_1799;)Z
ARG 1 equipment
METHOD method_24834 equipLootStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V

10
mappings/net/minecraft/entity/player/PlayerEntity.mapping
View File

@ -40,7 +40,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
ARG 1 world
ARG 2 pos
ARG 3 yaw
ARG 4 profile
METHOD method_16354 openJigsawScreen (Lnet/minecraft/class_3751;)V
ARG 1 jigsaw
METHOD method_16475 spawnParticles (Lnet/minecraft/class_2394;)V
@ -87,10 +86,8 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
ARG 1 dx
ARG 3 dy
ARG 5 dz
METHOD method_7261 getAttackCooldownProgress (F)F
ARG 1 baseTime
METHOD method_7262 dropShoulderEntities ()V
METHOD method_7263 spawnSweepAttackParticles ()V
METHOD method_7263 spawnSweepAttackParticles (Lnet/minecraft/class_238;FFLnet/minecraft/class_1297;)V
METHOD method_7265 createCooldownManager ()Lnet/minecraft/class_1796;
METHOD method_7266 resetStat (Lnet/minecraft/class_3445;)V
ARG 1 stat
@ -111,7 +108,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
METHOD method_7277 addCritParticles (Lnet/minecraft/class_1297;)V
ARG 1 target
METHOD method_7278 getEnchantmentTableSeed ()I
METHOD method_7279 getAttackCooldownProgressPerTick ()F
METHOD method_7281 incrementStat (Lnet/minecraft/class_2960;)V
ARG 1 stat
METHOD method_7282 increaseTravelMotionStats (DDD)V
@ -120,8 +116,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
ARG 5 dz
METHOD method_7283 setMainArm (Lnet/minecraft/class_1306;)V
ARG 1 arm
METHOD method_7284 disableShield (Z)V
ARG 1 sprinting
METHOD method_7285 addScore (I)V
ARG 1 score
METHOD method_7286 applyEnchantmentCosts (Lnet/minecraft/class_1799;I)V
@ -218,7 +212,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
METHOD method_7348 isPartVisible (Lnet/minecraft/class_1664;)Z
ARG 1 modelPart
METHOD method_7349 getNextLevelExperience ()I
METHOD method_7350 resetLastAttackedTicks ()V
METHOD method_7350 resetLastAttackedTicks (Z)V
METHOD method_7351 getBlockBreakingSpeed (Lnet/minecraft/class_2680;)F
ARG 1 block
METHOD method_7353 sendMessage (Lnet/minecraft/class_2561;Z)V

1
mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping
View File

@ -3,7 +3,6 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity
FIELD field_23739 ownerEntityId I
FIELD field_23740 leftOwner Z
METHOD method_24919 setProperties (Lnet/minecraft/class_1297;FFFFF)V
ARG 1 user
ARG 2 pitch
ARG 3 yaw
ARG 4 roll

5
mappings/net/minecraft/item/AxeItem.mapping
View File

@ -1,10 +1,5 @@
CLASS net/minecraft/class_1743 net/minecraft/item/AxeItem
FIELD field_7898 STRIPPED_BLOCKS Ljava/util/Map;
FIELD field_7899 EFFECTIVE_BLOCKS Ljava/util/Set;
METHOD <init> (Lnet/minecraft/class_1832;FFLnet/minecraft/class_1792$class_1793;)V
ARG 1 material
ARG 2 attackDamage
ARG 3 attackSpeed
ARG 4 settings
METHOD method_20269 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V
ARG 1 p

5
mappings/net/minecraft/item/HoeItem.mapping
View File

@ -1,10 +1,5 @@
CLASS net/minecraft/class_1794 net/minecraft/item/HoeItem
FIELD field_22486 EFFECTIVE_BLOCKS Ljava/util/Set;
FIELD field_8023 TILLED_BLOCKS Ljava/util/Map;
METHOD <init> (Lnet/minecraft/class_1832;IFLnet/minecraft/class_1792$class_1793;)V
ARG 1 material
ARG 2 attackDamage
ARG 3 attackSpeed
ARG 4 settings
METHOD method_20279 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V
ARG 1 p

2
mappings/net/minecraft/item/Item.mapping
View File

@ -1,11 +1,9 @@
CLASS net/minecraft/class_1792 net/minecraft/item/Item
FIELD field_18672 foodComponent Lnet/minecraft/class_4174;
FIELD field_21979 fireproof Z
FIELD field_8001 ATTACK_SPEED_MODIFIER_ID Ljava/util/UUID;
FIELD field_8003 BLOCK_ITEMS Ljava/util/Map;
FIELD field_8004 group Lnet/minecraft/class_1761;
FIELD field_8005 RANDOM Ljava/util/Random;
FIELD field_8006 ATTACK_DAMAGE_MODIFIER_ID Ljava/util/UUID;
FIELD field_8008 recipeRemainder Lnet/minecraft/class_1792;
FIELD field_8009 rarity Lnet/minecraft/class_1814;
FIELD field_8012 maxDamage I

7
mappings/net/minecraft/item/MiningToolItem.mapping
View File

@ -1,14 +1,7 @@
CLASS net/minecraft/class_1766 net/minecraft/item/MiningToolItem
FIELD field_23742 attributeModifiers Lcom/google/common/collect/Multimap;
FIELD field_7939 attackDamage F
FIELD field_7940 miningSpeed F
FIELD field_7941 effectiveBlocks Ljava/util/Set;
METHOD <init> (FFLnet/minecraft/class_1832;Ljava/util/Set;Lnet/minecraft/class_1792$class_1793;)V
ARG 1 attackDamage
ARG 2 attackSpeed
ARG 3 material
ARG 4 effectiveBlocks
ARG 5 settings
METHOD method_20273 (Lnet/minecraft/class_1309;)V
ARG 0 e
METHOD method_20274 (Lnet/minecraft/class_1309;)V

5
mappings/net/minecraft/item/PickaxeItem.mapping
View File

@ -1,7 +1,2 @@
CLASS net/minecraft/class_1810 net/minecraft/item/PickaxeItem
FIELD field_8899 EFFECTIVE_BLOCKS Ljava/util/Set;
METHOD <init> (Lnet/minecraft/class_1832;IFLnet/minecraft/class_1792$class_1793;)V
ARG 1 material
ARG 2 attackDamage
ARG 3 attackSpeed
ARG 4 settings

5
mappings/net/minecraft/item/ShovelItem.mapping
View File

@ -1,10 +1,5 @@
CLASS net/minecraft/class_1821 net/minecraft/item/ShovelItem
FIELD field_8912 PATH_STATES Ljava/util/Map;
FIELD field_8913 EFFECTIVE_BLOCKS Ljava/util/Set;
METHOD <init> (Lnet/minecraft/class_1832;FFLnet/minecraft/class_1792$class_1793;)V
ARG 1 material
ARG 2 attackDamage
ARG 3 attackSpeed
ARG 4 settings
METHOD method_20281 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V
ARG 1 p

5
mappings/net/minecraft/item/SwordItem.mapping
View File

@ -1,9 +1,4 @@
CLASS net/minecraft/class_1829 net/minecraft/item/SwordItem
FIELD field_8920 attackDamage F
METHOD <init> (Lnet/minecraft/class_1832;IFLnet/minecraft/class_1792$class_1793;)V
ARG 2 attackDamage
ARG 3 attackSpeed
ARG 4 settings
METHOD method_20282 (Lnet/minecraft/class_1309;)V
ARG 0 e
METHOD method_20283 (Lnet/minecraft/class_1309;)V

2
mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping
View File

@ -5,7 +5,7 @@ CLASS net/minecraft/class_2803 net/minecraft/network/packet/c2s/play/ClientSetti
FIELD field_12780 viewDistance I
FIELD field_12781 chatVisibility Lnet/minecraft/class_1659;
FIELD field_12782 mainArm Lnet/minecraft/class_1306;
METHOD <init> (Ljava/lang/String;ILnet/minecraft/class_1659;ZILnet/minecraft/class_1306;)V
METHOD <init> (Ljava/lang/String;ILnet/minecraft/class_1659;ZILnet/minecraft/class_1306;Z)V
ARG 1 language
ARG 2 viewDistance
ARG 3 chatVisibility

4
mappings/net/minecraft/util/hit/EntityHitResult.mapping
View File

@ -1,8 +1,8 @@
CLASS net/minecraft/class_3966 net/minecraft/util/hit/EntityHitResult
FIELD field_17592 entity Lnet/minecraft/class_1297;
METHOD <init> (Lnet/minecraft/class_1297;)V
METHOD <init> (Lnet/minecraft/class_1297;F)V
ARG 1 entity
METHOD <init> (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;)V
METHOD <init> (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;F)V
ARG 1 entity
ARG 2 pos
METHOD method_17782 getEntity ()Lnet/minecraft/class_1297;