Commit Graph

76 Commits

Author SHA1 Message Date
ByMartrixX 5c3acefeeb
Use upper snake case with static final fields (#2624)
* Use upper snake case with static final fields

* Fix fields that I missed
2021-08-07 16:51:52 +01:00
ByMartrixX 552595f20f
Some entity renderer and model mappings (#2566)
* Some entity renderer and model mappings

* More mappings

* Update mappings, add some parameters
2021-07-13 03:05:29 +00:00
LambdAurora 3d45004495
Map some stuff in entity models. (#2267)
* Map some stuff in entity models.

* Update mappings/net/minecraft/client/render/entity/model/ModelWithHat.mapping

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
2021-04-03 13:30:15 +01:00
Shnupbups b06cc505e0
48a things (#1894)
* 48a things

* stuff

* Apply suggestions from code review

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>

* just to get checks running again

* Revert "just to get checks running again"

This reverts commit 509ab81d80.

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>
2020-12-03 19:50:38 +00:00
Thalia Nero e0df01cad6
Entity rendering (#1861)
* Map entity model classes.

* Map new stuff in entity renderers.

* - EntityModelParts -> EntityModels
- ModelPartGroup -> ModelPartData
- ModelPartData -> ModelPartDataNode
- TexturedModelPartGroup -> TexturedModelPartData

* Apply suggestions from code review

Co-authored-by: Gegy <gegy1000@gmail.com>

* Apply other suggestions

* Update mappings/net/minecraft/client/model/TexturedModelData.mapping

Co-authored-by: YanisBft <doublecraft.official@gmail.com>

* Remap *PartData -> *ModelData, move Dilation to client.util.math

* Update crobbed mapping.

Co-authored-by: Gegy <gegy1000@gmail.com>
Co-authored-by: YanisBft <doublecraft.official@gmail.com>
2020-11-12 08:57:40 +00:00
modmuss50 c91f482141 20w45a 2020-11-04 20:44:22 +00:00
modmuss50 49710ba86a 1.16-pre3 2020-06-10 18:05:28 +01:00
Joseph Burton 7725dcb827
Lots of entity mappings (#1322)
* Lots of entity mappings

* Apply review suggestions

* Apply more review suggestions

* Tweak drowned and enderman mappings

* Properly rename EndermanEntity.chasing -> provoked

* capChange -> stepTowards
2020-05-06 21:49:35 +01:00
Shnupbups 558487a1c0
i mapped things: HD remaster (#1271)
* some stuff HD remaster

* Update mappings/net/minecraft/world/biome/BasaltDeltaBiome.mapping

Co-Authored-By: Yanis48 <doublecraft.official@gmail.com>

* Delta -> Deltas

* Apply suggestions from code review

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>

* Update mappings/net/minecraft/world/gen/feature/DeltaFeatureConfig.mapping

Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
2020-04-14 15:01:16 +01:00
liach 159546e8cd
Map some 20w15a new classes (entities, enchantments) (#1269)
* Map some 20w15a new classes (entities, enchantments)

Signed-off-by: liach <liach@users.noreply.github.com>

* Some javadocs

* Just refer by id

Signed-off-by: liach <liach@users.noreply.github.com>

* Fix bad class name

Signed-off-by: liach <liach@users.noreply.github.com>

Co-authored-by: liach <liach@users.noreply.github.com>
2020-04-08 21:48:41 +01:00
­Sollace 3d228282e6
Renderer mappings (#988)
* part.render(matrix, vertices, light, overlay, red, green, blue, alpha)

* Fixed bad names

* Determined by the call to part.render(matrix, vertices, light, overlay)
  which delegates to part.render(matrix, vertices, light, overlay, 1, 1, 1, 1)

* Now we extrapolate to everything that calls part.render(matrix, vertices, light, overlay)
  Meanhile VertexConsumerProvider is

* Now we extrapolate to everything that cals pars.render(matrix, vertices, light, overlay, red, green, blue, alpha)

* This is not a render method! It sets the yaw and pitch on the skull

* Now we extrapolate to things that call mode.render(matrix, vertices, light, overlay, red, green, blue, alpha)
  Not much to change there though

* These are known from EntityRenderDispatcher

* render calls renderLabelIfPresent

* Now we're looking at things which call EntityRenderDispatcher.render(entity, x, y, z, yaw, matrix, provider, light)

* In ClientPlayNetworkHandler.onItemPickupAnimation the second entity is gotten from packet.getCollectorEntityId and defaulted to the player if null. The first entity is an item entity or an experience orb entity

* Going back to EntityRenderDispatcher, we can see the code for rendering shadows was moved here from the renderer itself

if (this.gameOptions.entityShadows && this.renderShadows && entityRenderer14.shadowRadius > 0.0f && !entity.isInvisible()) {
    double double22 = this.getSquaredDistanceToCamera(entity.getX(), entity.getY(), entity.getZ());
    float float24 = (float)((1.0 - double22 / 256.0) * entityRenderer14.field_4672);
    if (float24 > 0.0f) {
       renderShadow(matrix, provider, entity, float24, tickDelta, this.world, entityRenderer14.shadowRadius);
    }
}

* The last parameter is shadow radius, but to be sure we check, nd indeed it is reduced when the rendered entity is a baby

    private static void renderShadow(MatrixStack matrix, VertexConsumerProvider provider, Entity entity, float float4, float tickDelta, WorldView world, float radius) {
        float float8 = radius;
        if (entity instanceof MobEntity) {
            if (((MobEntity)entity).isBaby()) {
                float8 *= 0.5f;
            }
        }

* float4 was a myster, but it's just passed down as-is and used to determine the opacity of the shadow!

float float16 = (float)((opacity - (y - pos.getY()) / 2.0) * 0.5 * world.getBrightness(pos));
if (float16 >= 0.0f) {

* Forgot this one

* This is all low-hanging fruit.

* EntityRenderDispatcher.shouldRender(entity, frustrum, x, y, z)
-> EntityRenderer.isVisible(entity, frustrum, x, y, z)
-> Entity.shouldRenderFrom(x, y, z)

    @Environment(EnvType.CLIENT)
    public boolean shouldRenderFrom(double x, double y, double z) {
        double double8 = this.getX() - x;
        double double10 = this.getY() - y;
        double double12 = this.getZ() - z;
        double double14 = double8 * double8 + double10 * double10 + double12 * double12;
        return this.shouldRenderAtDistance(double14);
    }

* More things we know

* This is set by calling entity.getLeaningPitch

* This is only overriden by CreeperEntityRenderer and returns a float computed from the fuse time.
The value is then passed to getOverlay where it's passed to OverlayTexture.getU(animationCounter).

This causes the creeper to flash white when active. The same method,
interestingly, will use the V to create the hurt/death overlay

OverlayTexture.packUv(
	OverlayTexture.getU(animationCounter),
	OverlayTexture.getV(entity.hurtTime > 0 || entity.deathTime > 0)
)

* The final patches

* xrayEnabled -> isGlowing

* Commit suggestions/name changes I missed during rebase

Co-Authored-By: Juuxel <6596629+Juuxel@users.noreply.github.com>

* Fix typos

* yaw -> tickDelta

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>

* provider -> vertexConsumers

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>

* matrix -> matrices

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>

* Fixed some encorrect names

* entry -> matrices

* textureU/V -> u/v

* isBanner -> isBannerBlock

* frustrum -> frustum

Co-Authored-By: Gegy <gegy1000@gmail.com>

* Fix broken/changed mappings for 20w10a

* grammar

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>

* Update mappings/net/minecraft/client/particle/ItemPickupParticle.mapping

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: Gegy <gegy1000@gmail.com>
2020-03-27 11:06:32 +00:00
modmuss50 a068df5d3d 20w13a 2020-03-25 17:49:03 +00:00
Juuxel 08f62761fc
EnderCrystal -> EndCrystal, #1163 improvements (#1173)
The end crystal entity is registered as minecraft:end_crystal.
2020-03-11 16:17:29 +00:00
liach 7bd162989d
Pick up rendering stuff and dragon stuff (#1163)
* Pick up #1026 and adjustments

ArmorFeatureRenderer, BipedEntityModel and some player stuff

Parrot entity rendering fixes

At the moment, I don't know the difference between method_17110 and method_17111.

method_17110 -> animateModel

Still a provisional name.

Finish the other feature renderers (except CapeFeatureRenderer)

Name methods involving armor stands

Work on Ender Dragon-related things

overlay{Message, Tinted} -> {message, tinted}

Add docs for ClientPlayerEntity#wateriness (now wetness)

ClientPlayerEntity#getVisibilityReductionFromWater -> getScaledWetness

Actually add javadocs

newHealth -> health

DragonFireballEntityRenderer#FIREBALL -> LAYER

* Update mappings/net/minecraft/client/render/RenderLayer.mapping

Co-authored-by: Kyarei <uruwi@protonmail.com>
2020-03-11 15:09:33 +00:00
modmuss50 1b7aa91a4d 20w10a
bit of a big one
2020-03-04 20:22:46 +00:00
liach b00c92199f
Map new classes, staging (#1122)
Map new classes, staging
2020-02-24 20:14:56 +00:00
LambdAurora f20fc8f630
Rename every view argument to world and random additions. (#1114)
* WIP on view argument nuking.

* More mappings.

* Nuke remaining view arguments.

* FeatureRendererContext#getTexture() ARG 1 wolf -> entity
2020-02-17 13:48:43 +00:00
modmuss50 d2afdda25f 20w07a 2020-02-14 14:54:37 +00:00
modmuss50 b3d3023795 1.15-pre4 2019-12-03 13:35:46 +00:00
modmuss50 89b749da2a Update enigma for Javadoc support.
Mappings were re-written storing the inner classes at the end of the file.
2019-12-02 13:55:18 +00:00
Runemoro 966033b532 More rendering mappings (#986)
* More rendering mappings

* Even more rendering mappings

* Update mappings/net/minecraft/client/render/OverlayTexture.mapping

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>

* Update mappings/net/minecraft/client/render/OverlayTexture.mapping

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>

* Fix HashStrategy removed in last PR

* Fixes by liach
2019-12-02 13:47:40 +00:00
modmuss50 9fb64b9b26 1.15-pre1 2019-11-21 19:13:18 +00:00
modmuss50 3bf4ded164 19w45a 2019-11-07 19:37:31 +00:00
liach 02908445ab Mapped all top-level classes (#934)
* Mapped all top-level classes

No more obfuscated top-level class

Signed-off-by: liach <liach@users.noreply.github.com>

* Mapping inner classes (Still some left)

These to go:
net/minecraft/datafixers/fixes/LeavesFix$class_1192
net/minecraft/structure/NetherFortressGenerator$class_3404
net/minecraft/structure/OceanMonumentGenerator$class_3367
net/minecraft/structure/OceanMonumentGenerator$class_3368
net/minecraft/structure/OceanMonumentGenerator$class_3369
net/minecraft/structure/OceanMonumentGenerator$class_3370
net/minecraft/structure/OceanMonumentGenerator$class_3371
net/minecraft/structure/OceanMonumentGenerator$class_3372
net/minecraft/structure/OceanMonumentGenerator$class_3373
net/minecraft/structure/OceanMonumentGenerator$class_3375
net/minecraft/structure/OceanMonumentGenerator$class_3388
net/minecraft/structure/StrongholdGenerator$class_3427
net/minecraft/structure/StrongholdGenerator$class_3466
net/minecraft/structure/Structure$class_3500
net/minecraft/structure/WoodlandMansionGenerator$class_3478

Signed-off-by: liach <liach@users.noreply.github.com>

* Update StructurePoolBasedGenerator.mapping

* Fixes as suggested by @Runemoro

Signed-off-by: liach <liach@users.noreply.github.com>
2019-11-02 21:51:27 +00:00
modmuss50 bf6fdd7195 19w44a 2019-10-30 16:28:24 +00:00
liach 6fa1e34c83 19w42a rendering and layers etc (#917)
* 19w42a rendering and layers etc

Signed-off-by: liach <liach@users.noreply.github.com>

* Stage changes

Signed-off-by: liach <liach@users.noreply.github.com>

* stuff stuff stuff

Signed-off-by: liach <liach@users.noreply.github.com>

* fixed color

Signed-off-by: liach <liach@users.noreply.github.com>

* Banner Pattern "Patterns"

Patterns name see https://minecraft.gamepedia.com/Banner#Block_entity

* Some more changes

Signed-off-by: liach <liach@users.noreply.github.com>

* Add 2 mappings

Signed-off-by: liach <liach@users.noreply.github.com>
2019-10-30 16:15:03 +00:00
Siphalor 194e42daff Mapped entity rendering methods/classes & options screens (#913)
* Mapped entity rendering methods and classes & options screens

* Fixed Knit's issues and implemented liach's suggestions

* Removed strange leftover obf stubs (I blame Knit)

* Mapped some more stuff from AnimalModel

* Adapt some stuff from Runemoro

* Some more Runemoro

* Another two fixes

* Unmap unobfuscated mapping

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>

* Shorten dragon

by liach

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>

* Shorten biped model

by liach

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>

* Shorten another biped model

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>
2019-10-25 09:02:48 +01:00
Shnupbups 68328eddc5 Some new stuff (#903) 2019-10-09 20:35:45 +01:00
Runemoro 04ad11fed6 Rendering mappings (#897)
* Rendering mappings

* Remove duplicate class

* Suggestions by liach and juuxel

* Unmap inferred field and move to better package
2019-10-09 17:43:46 +01:00
modmuss50 052e77acc0 19w39a 2019-09-27 17:23:24 +01:00
Runemoro 35891f155e Map some new 19w34a classes (#831)
* Map some new 19w23a classes

* Fixes

* Fix typo

* Drop methods that are gone
2019-09-01 16:21:31 +01:00
Runemoro 618083791c Fix some methods not using intermediaries (#788) 2019-07-08 18:09:22 +02:00
modmuss50 e20cfe9b0e 1.14.4-pre3 2019-07-08 13:27:46 +01:00
modmuss50 618de57dfb 1.14.4-pre2 2019-07-04 16:29:01 +01:00
Adrian Siekierka ab32dae2fa 1.14.4-pre1 2019-07-03 20:50:19 +02:00
Adrian Siekierka 1a6f261a2e The Great Intermediary Update, Part 1 2019-06-28 23:55:20 +02:00
modmuss50 b6ed693b8d 1.14.3-pre4 2019-06-19 20:24:08 +01:00
modmuss50 b27778997a 1.14.3-pre3 2019-06-19 18:48:53 +01:00
modmuss50 8554a5ae8c 1.14.3-pre2 2019-06-07 12:45:25 +01:00
Adrian Siekierka bdbf125b33 1.14.3-pre1 2019-06-03 18:48:18 +02:00
Yanis48 3abd72da61 Various entity renderer & model mappings (#707) 2019-05-18 13:23:23 +02:00
modmuss50 fa072139bf 1.14.1 Pre-Release 1 2019-05-07 17:05:49 +01:00
modmuss50 de13dda07c 1.14 Pre-Release 5 2019-04-18 22:01:39 +01:00
modmuss50 782b07c692 1.14 Pre-Release 4 2019-04-17 17:41:25 +01:00
Adrian Siekierka 13943c582b update to 1.14 Pre-Release 3 2019-04-16 17:51:03 +02:00
Runemoro d59d0ed42f Client mappings (#620) 2019-04-16 16:13:47 +02:00
modmuss50 2fd19127ea 1.14 Pre-Release 2 2019-04-12 15:38:24 +01:00
modmuss50 b13686aed0 1.14 Pre-Release 1 2019-04-10 16:36:17 +01:00
modmuss50 0e8b18ad3f 19w14b 2019-04-05 17:03:47 +01:00
Runemoro fca78f74f4 More mappings 2019-04-04 18:04:19 -04:00
modmuss50 845be1d2ec 19w14a 2019-04-03 17:16:41 +01:00
modmuss50 53620837bf 19w13a 2019-03-27 18:35:10 +00:00
modmuss50 b9285540bc 19w12a 2019-03-20 17:56:26 +00:00
Runemoro 936397a574 Client class mappings (#534)
* Client class mappings

* A few more classes

* 3 more

* A few more classes

* a

* Suggestions

* ErrorScreen
2019-03-18 19:53:22 +00:00
modmuss50 a7eee8f064 Fix inner class names 2019-03-14 19:41:19 +00:00
modmuss50 eef3d973f2 Save in enigma, removes some propagated method names 2019-03-14 16:26:35 +00:00
modmuss50 e3d24ae102 19w11b 2019-03-14 15:39:51 +00:00
Adrian Siekierka 333e59da73 19w11a 2019-03-14 13:57:09 +01:00
asie 4b91cfbcf5 19w09a 2019-02-27 19:17:22 +01:00
gegy1000 9c2a779f00 (#507) Arbitrary Mapping 2019-02-27 19:09:49 +01:00
Adrian Siekierka c25fcbb177 19w08b 2019-02-21 19:19:18 +01:00
Adrian Siekierka d1435774dc fix mappings 2019-02-20 22:01:25 +01:00
Adrian Siekierka 66156a5471 update to 19w08a 2019-02-20 21:49:23 +01:00
liach 9ce0143a77 Map all fields, methods, and inner classes of fox entity (#459) 2019-02-16 21:50:35 +01:00
Adrian Siekierka 4f390a9306
map 19w07a resource reloading (#462) 2019-02-14 20:54:51 +01:00
modmuss50 8a2af8044e 19w07a 2019-02-13 17:35:08 +00:00
Adrian Siekierka 6d8d358514
Client/Server -> S2C/C2S (#458) 2019-02-13 02:13:12 +01:00
Blake Redenius 901311e1e5 Mapping for SynchronousResourceReloadListener#a -> reloadResources. Also fix up some LootTables names, and a few other misc mappings. (#455) 2019-02-10 23:43:24 +01:00
Adrian Siekierka e2a1bba0b6 19w06a 2019-02-06 21:22:24 +01:00
Adrian Siekierka 1bfe80a06a update to 19w05a 2019-01-30 18:48:39 +01:00
Adrian Siekierka 995df6291a update to 19w04a/Enigma 0.13.x 2019-01-24 20:10:22 +01:00
Adrian Siekierka 37e4c7616b update to 19w03b 2019-01-18 00:35:46 +01:00
modmuss50 347fd572c2 19w03a 2019-01-16 18:24:40 +00:00
Adrian Siekierka bf62f29ddf update to 19w02a 2019-01-09 18:20:38 +01:00
Adrian Siekierka a2c2c754e9 autofixes 2018-12-22 19:26:44 +01:00
Erlend Åmdal 79fee4ac00 Entity/Feature rendering (#339) 2018-12-22 19:20:49 +01:00