Commit Graph

149 Commits

Author SHA1 Message Date
Shnupbups 4ac86f56c0
23w13a_or_b stuff (#3537)
* 23w13a_or_b stuff

* stuff
2023-04-10 22:13:14 +01:00
modmuss50 5f172bcaf9 23w13a_or_b 2023-04-01 11:20:48 +01:00
apple502j a8df882cf3
23w12a stuff (#3526)
* 23w12a stuff

* Fix javadoc

* Fix typo
2023-03-25 16:50:21 +09:00
Shnupbups 7d293c0ef2
23w12a stuff (#3525)
* 23w12a stuff

Probably enough for now, I'll take a more thorough look later

* More stuff
2023-03-23 12:25:44 +09:00
modmuss50 ab74ad09af 23w12a 2023-03-22 16:31:25 +00:00
apple502j dd773c9900
1.19.4-pre2 stuff (#3518) 2023-03-01 21:04:07 +09:00
modmuss50 f8461a1b99 1.19.4-pre2 2023-02-27 15:14:14 +00:00
apple502j ea2a1c0714
More 1.19.4-pre1 stuff (#3516)
* 1.19.4-pre1 stuff

* Fix javadoc

* Update mappings/net/minecraft/data/server/tag/TagProvider.mapping

* Update mappings/net/minecraft/data/server/tag/TagProvider.mapping

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: Shnupbups <shnupbups@gmail.com>

---------

Co-authored-by: Shnupbups <shnupbups@gmail.com>
2023-02-25 17:25:22 +09:00
Shnupbups c9788b4f8e
1.19.4-pre1 stuff (#3515)
* 1.19.4-pre1 stuff

Might do more later

* little more

* Suggestions
2023-02-24 20:56:03 +09:00
modmuss50 6d9dc3a565 1.19.4-pre1 2023-02-22 17:22:18 +00:00
Shnupbups 81301f8764
23w07a stuff (#3492)
* 23w07a stuff

Got a bit carried away...

Some names aren't ideal, and there's still more that could be done, so feedback is appreciated

* More + suggestions
2023-02-16 21:22:27 +09:00
modmuss50 b3dc08e924 23w07a 2023-02-15 16:19:06 +00:00
MattiDragon 3a9b0d7b13
Map damage changes + /damage + world changes (#3476)
* Map damage changes + /damage + world changes

* Fix issues

* Fix capitalisation

* Fix typo

Co-authored-by: Shnupbups <shnupbups@gmail.com>

---------

Co-authored-by: Shnupbups <shnupbups@gmail.com>
2023-02-11 12:31:27 +09:00
Jerozgen 54d50fd290
Fix typo in RecipeProvider (#3486) 2023-02-11 02:45:38 +11:00
Shnupbups 1df1065b4d
Data package restructure (#3465)
With the introduction of sub-packs included in the base game, there are several classes for the 1.20 datapack and several for the vanilla datapack which would benefit from being renamed and put into packages to make this clearer.

Classes which are only used for the vanilla datapack have been put into a `vanilla` subpackage, and ones for the 1.20 datapack have been put into a `onetwenty` subpackage.

Furthermore, classes which are only used for the vanilla datapack have been prefixed with `Vanilla`.

The above changes should not be considered impactful as these classes are strictly for generating the vanilla and 1.20 datapacks and are incredibly unlikely to be referenced by modders.

However, tag providers which were named with an `Abstract` prefix have had this removed. This makes them match with other providers. This is a somewhat impactful refactor.
2023-02-01 21:42:58 +11:00
Shnupbups a76c452f2b
23w04a stuff (#3464)
* 23w04a stuff

mostly smithing related

* fix conflict

* Add PalettedPermutationsAtlasSource

* Update RecipeProvider.mapping

* a few more missing things

* Update mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping

* Apply suggestions from code review

* damnit

* more
2023-01-27 19:16:31 +09:00
MattiDragon 2476989327
Map armor trims and related things (#3463)
* Armor trim changes

* Map more armor stuff

* Armor trim recipe and more

* Begin work on forging screen changes

* More armor trim related mappings

* Fix mistakes

* Fix screen handler package

* More fixes

* Forgot one

* More descriptive name
2023-01-27 09:42:30 +09:00
modmuss50 be911685f0 23w04a 2023-01-24 16:14:55 +00:00
Shnupbups 25ff73b986
22w46a advancement stuff (#3407) 2022-11-16 20:32:50 +00:00
Shnupbups 63ee53efc3
22w45a datagen (#3393) 2022-11-09 18:18:30 +00:00
modmuss50 76d101e1c9 22w45a 2022-11-09 15:51:18 +00:00
apple502j ab7fc77e3f
22w44a datagen (#3380) 2022-11-04 09:32:34 +09:00
modmuss50 ba1a44d4cb 22w44a 2022-11-02 14:58:41 +00:00
apple502j 09749fc9e6
22w43a datagen part two (#3368) 2022-10-27 23:51:29 +09:00
Shnupbups 32233a3d15
22w43a data stuff (#3363) 2022-10-26 18:03:39 +01:00
modmuss50 aa17ad327b 22w43a 2022-10-26 15:05:20 +01:00
Shnupbups 85ba625939
22w42a data stuff (#3349)
* data stuff

* Update mappings/net/minecraft/data/family/BlockFamily.mapping

* clarify featureset
2022-10-23 02:44:33 +09:00
Shnupbups 7143b2929a
Fix typo (#3336) 2022-10-20 19:22:54 +01:00
Shnupbups 026940f83b
More 22w42a datagen stuff (#3335)
plus more stuff
2022-10-20 19:16:14 +01:00
Shnupbups 07eb6007e8
22w42a datagen and recipecategory stuff (#3330)
* 22w42a datagen stuff

* more stuff
2022-10-20 18:46:19 +01:00
Player be004e3916 22w42a 2022-10-19 19:11:34 +02:00
apple502j c8d0b88c2a
1.19.1 mapping bonanza 3: datagen (#3270)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-08-20 15:01:34 +01:00
haykam821 24ee006d5a
Rename the BlockLootTableGenerator.addDoorDrop method to doorDrops (#3276)
Fixes #3275
2022-08-12 11:45:09 +01:00
apple502j eb2bbb15ae
Rename Structure and StructureType (#3183)
* Rename Structure and StructureType
Structures really need a revisit. In my opinion the net.minecraft.structure package should be gone and
everything should be moved to net.minecraft.world.gen.structure. That'd be a very big change, though.
This commit basically reverts the entirety of #3079 and contains the changes necessary to keep consistency
(but not other new changes). I could make it bigger, but this needs an ASAP merge to stop the bad names from
going to the release.

Summary of the renames:

- `structure.Structure` became `structure.StructureTemplate`. See `/place template`, datafixes, etc.
- `structure.StructureType` became `world.gen.structure.StructureType`.
- `world.gen.structure.StructureType` became `world.gen.structure.Structure`.
- `world.gen.structure.StructureTypes` became `world.gen.structure.Structures`.
- Other names referencing the renamed classes by their old name
- And missed "feature" renames (Fixes #3179)

* Rename StructureManager

* merging gone wrong

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-06-01 16:07:00 +01:00
Shnupbups 93c00dbd71
22w19a stuff (#3156)
* 22w19a stuff

Tags, Commands, Points of Interest, Datagen Path Resolvers, and a couple of tidbits

* suggestions
2022-05-16 12:08:07 +01:00
Player 33ca01b966 22w19a 2022-05-12 20:28:43 +02:00
Shnupbups 42ea7eaefb
a couple of small datagen fixes (#3150)
can also be backported to 1.18
2022-05-12 14:41:33 +01:00
Shnupbups d9b288b901
22w18a stuff (#3137)
* 22w18a stuff

oh gosh oh heck

* whoops i did more

* Update Registry.mapping

* fixes

* Update MinecraftServer.mapping

* Apply suggestions from code review

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
Co-authored-by: frqnny <45723631+frqnny@users.noreply.github.com>

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
Co-authored-by: frqnny <45723631+frqnny@users.noreply.github.com>
2022-05-11 19:28:01 +01:00
haykam821 7e4228442f
Map changes to banner patterns in 22w18a (#3135) 2022-05-05 17:36:49 +01:00
Player 5dc883892e 22w18a 2022-05-04 20:34:27 +02:00
Shnupbups 22a86199bd
22w16a stuff (#3100)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-04-20 19:55:16 +01:00
Shnupbups 67250a55d3
22w15a stuff (#3091)
* 22w15a stuff

* Apply suggestions from code review

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

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>
2022-04-19 11:06:11 +01:00
Player 8b8dc86b74 22w15a 2022-04-13 18:50:51 +02:00
Shnupbups 42acd4afae
22w14a stuff 2: electric boogaloo (#3085)
* 22w14a stuff 2: electric boogaloo

* Update mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
2022-04-11 14:39:36 +00:00
Shnupbups f0cf73b5fa
22w14a stuff (#3078)
* 22w14a stuff

* more

* more
2022-04-08 08:55:17 +01:00
Player 13c4ad0853 22w14a 2022-04-06 21:01:01 +02:00
apple502j 7930e597e4
22w13a misc stuff (#3073)
* 22w13a stuff

* Update StringIdentifiable.mapping

* Fix several mapping bugs
Resolves #3043
Resolves #3057
Resolves #3066
2022-04-06 16:05:01 +00:00
Player 39344922af 22w13a 2022-03-31 19:20:30 +02:00
Shnupbups 64377ac365
22w11a stuff (#3044)
* this is all i can bear to do for now, im tired

* i lied

* Update DispenserBehavior.mapping

* have a little more, as a treat

* fixes

* *more* stuff

* more animation stuff

* model parts

* initAndGetDefault

y'all have some weird defaults mojang
2022-03-19 15:55:02 +00:00
Player 845467b67e 22w11a 2022-03-16 21:42:31 +01:00
Shnupbups 7ca2496621
1.18.2-pre1 stuff (#3022)
* 1.18.2-pre1 stuff

* Update StructureFeature.mapping

* Update StructureFeature.mapping

* 1.18.2-pre1 stuff

* yeah

* removed duplicates

not sure how they managed to stay

* Update mappings/net/minecraft/world/StructureSpawns.mapping

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
2022-02-23 10:56:40 +00:00
Shnupbups 4731a2c3ce
22w07a stuff (#3012)
* biome tags

* more biome tag stuff + datafix

* more stuff

* remove stuff mapped by #3013

* some noise stuff

* Apply suggestions from code review

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

* dropped invalids

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
2022-02-19 11:29:24 +00:00
apple502j 20e6725f2c
22w07a stuff (#3013)
* 22w07a stuff

* Update Registry.mapping

* Apply suggestions from code review

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

* registryKeys -> keys

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-02-18 22:44:32 +00:00
apple502j 3fa5f241ce
22w06a more tags/registries stuff (#3003)
* 22w06a more tags/registries stuff

* rename to getIndexedEntries
2022-02-12 17:04:11 +00:00
enbrain c35b6868e2
Rename some builder classes (#2921)
* Rename some builder classes

* builder -> advancementBuilder

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: modmuss50 <modmuss50@gmail.com>
2022-02-11 09:02:52 +00:00
Shnupbups 0a36582e4b
Datagen refactors (#2905)
* `BlockStateDefinitionProvider` -> `ModelProvider`

`BlockStateDefinitionProvider` is inaccurate, as it also handles all the models in the game including item models.

Also moved everything from `data/client/model` down to just `data/client` as they're *all* model related so there's no point in having it be separate.

Should probably backport this to 1.18, and maybe even 1.17.1 if #2904 is merged. Also recommend the rename is reflected in the Fabric API implementation also.

* Make all providers and generators plural where appropriate

Also change `WorldgenListProvider` to `WorldgenProvider`... why did it have `List` in the first place?

* Change to singular prefixes

* Fix some incorrect names

* Update Tag.mapping

* Update RecipeProvider.mapping

* Update RecipeProvider.mapping

* Fix bad merge

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: modmuss50 <modmuss50@gmail.com>
2022-02-11 08:55:08 +00:00
modmuss50 0ef70746f2 22w06a 2022-02-09 18:58:35 +00:00
modmuss50 26c319461b 22w03a 2022-01-19 17:26:32 +00:00
apple502j 119815df5d
More 21w44a stuff (#2811)
* More 21w44a stuff

* Apply suggestions from code review

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

* Update mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

* Update mappings/net/minecraft/util/math/ChunkSectionPos.mapping

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

* Rename some stuff

* Apply suggestions from code review

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
2021-11-08 23:34:33 +00:00
Shnupbups 28da2e9f1e
misc stuff (#2806)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2021-11-08 23:33:58 +00:00
modmuss50 35c46fc6b7 21w44a 2021-11-03 18:39:11 +00:00
apple502j a5b43d42be
21w41a data (#2768) 2021-10-17 22:16:34 +01:00
apple502j 32a862fbda
21w41a stuff (#2749)
Co-authored-by: modmuss50 <modmuss50@gmail.com>
2021-10-15 16:30:33 +01:00
modmuss50 1391c4cb97 21w40a 2021-10-07 15:55:57 +01:00
Evan Steinkerchner 755162fb98
Update method mappings in RecipesProvider (#2644) 2021-08-22 22:21:41 +01:00
Dimas e56d581682
Rename optional tag provider builder (#2585) 2021-07-21 08:19:06 +01:00
apple502j 34eba1a24f
Random 1.17 pre-release stuff (#2476)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2021-06-07 14:46:10 +01:00
Shnupbups 4e9beace48
21w19a stuff (#2392)
* 19a

* Update Items.mapping

* things

* datagen stuff
2021-05-13 06:09:53 +00:00
Player 8fc50a424d 21w19a 2021-05-12 17:50:44 +02:00
enbrain a4620efe64
Drop invalid mappings (#2384) 2021-05-12 12:59:52 +00:00
apple502j f344dece1a
21w17a stuff (#2355)
* 21w17a stuff

* Fix lint failure

* Rename onEntitiesDestroy

* Rename setYaw
2021-04-30 17:02:56 +00:00
Player 71cbfa770b 21w17a 2021-04-28 17:44:41 +02:00
LambdAurora 21e55899a1
Fix regression and map recipe datagen. (#2339)
* Fix regression and map recipe datagen.

* Update mappings/net/minecraft/data/server/recipe/CraftingRecipeJsonFactory.mapping

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

Co-authored-by: YanisBft <doublecraft.official@gmail.com>
2021-04-22 10:47:56 +00:00
Player 7f65f51654 Fix src member names in unmatched root classes 2021-04-22 01:15:30 +02:00
Player 0d9ca60b62 21w16a 2021-04-22 00:49:29 +02:00
haykam821 4a38df5fed
Map raw metal blocks (#2327)
* Map raw metal blocks

* Rename the MapColor.IRON field to RAW_IRON_PINK
2021-04-17 07:11:01 +00:00
­Sollace 5535953433
Data Package Mappings (#2301)
* Data package mappings

* Fix a whoops

* Update mappings/net/minecraft/data/server/RecipesProvider.mapping

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

* Update mappings/net/minecraft/data/server/RecipesProvider.mapping

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

* WORKING_DIRECTORY -> DEBUG_OUTPUT_DIRECTORY

* eh

* Update mappings/net/minecraft/tag/Tag.mapping

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

* Update mappings/net/minecraft/data/SnbtProvider.mapping

* Missed a few things

* inputItem -> input + outputItem -> output

* Update mappings/net/minecraft/data/SnbtProvider.mapping

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

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>
Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
2021-04-12 13:28:55 +01:00
haykam821 8c4c969b5a
Map various changes to block families (#2293)
* Map deepslate block families

* Rename the BlockFamily.chsieled method to chiseled

* Update the names of copper block families to match the new oxidation level names

* Map the waxed oxidized cut copper block family

* Map various parameters related to block families in the RecipesProvider class
2021-04-08 10:41:25 +01:00
haykam821 ade9c3ded9
Map block families (#1965)
* Map block families

* Move the RecipeJsonFactory class to the proper package

* Rename the RecipeJsonFactory class to CraftingRecipeJsonFactory

* Fix the Javadoc for the RecipesProvider.getVariantRecipeInput method
2021-01-21 23:33:13 +00:00
modmuss50 a6ba184207 21w03a 2021-01-20 19:22:41 +00:00
YanisBft b39f5afed2
Server data stuff (#1958) 2021-01-16 11:45:16 +00:00
yyny f6fc193bb8
Complete RecipesProvider mapping (#1939)
* Complete RecipesProvider mapping

* Apply Juuxel's suggestion

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

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
2020-12-25 23:25:13 +00:00
YanisBft 33da594c95
20w49a cleanup (#1911)
* 20w49a cleanup

* Update Vibration.mapping
2020-12-14 21:35:39 +00:00
Shnupbups d05efed548
20w49a stuff (#1903)
* fuck it i'm committing and going to bed

here's what i got

* lots of misc stuff

haha yes

* Delete class_5700.mapping
2020-12-09 12:21:32 +00:00
modmuss50 3e78db4504 20w46a 2020-11-11 19:27:23 +00:00
modmuss50 a1347ccd43 1.16.2-pre2 2020-08-05 18:08:42 +01:00
Yanis48 c72ab7649e
Some fixes (#1481)
* Some fixes

* FeaturePiece -> StructurePiece
2020-06-20 19:51:40 +01:00
Shnupbups 49284a0f45
pre1 stuff (#1420)
* pre1 stuff

idk

* more stuff

* remove things already mapped

removes things already mapped by newly merged prs
2020-06-07 16:02:50 +01:00
modmuss50 e9c5c02d50 20w22a 2020-05-29 14:31:34 +01:00
Shnupbups 4c440d8179
20w20a stuff (#1351)
* some stuff

new criterions, gamemode switcher screen, and datafixes

* more stuff

predicates and the other criterion i missed

* more predicate stuff

* Update mappings/net/minecraft/advancement/criterion/ItemUsedOnBlockCriterion.mapping

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

* Update PlayerGeneratesContainerLootCriterion.mapping

* Update GameModeSwitcherScreen.mapping

* more gamemode switcher stuff

* Update mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping

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

* Update mappings/net/minecraft/client/gui/screen/ingame/GameModeSwitcherScreen.mapping

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

* toast and tutorial things

just figured i'd throw this in

Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
2020-05-20 00:49:55 +01:00
Prospector c67050a4f4
Fix a slight error with the loot table generator mappings (#1357) 2020-05-15 16:35:35 +01:00
modmuss50 015995dd3f 20w20a 2020-05-13 18:06:00 +01:00
Prospector d3323c23bf
Improve Loot Table mappings (#1338)
* Improve Loot Table mappings

* Fix a couple wrong names

* finish itemDropper -> lootConsumer

* AND -> NOR
2020-05-10 18:48:40 +01:00
liach 9b001525fa
EntityCategory -> SpawnGroup, SpawnType -> SpawnReason (#1327)
* EntityCategory -> SpawnGroup, SpawnType -> SpawnReason

Closes #1315

* Fix missed name

Co-authored-by: liach <liach@users.noreply.github.com>
2020-05-06 21:53:25 +01:00
modmuss50 cf0ef0a6bd 20w15a 2020-04-08 15:44:19 +01:00
modmuss50 0c14fa6444 20w14a 2020-04-02 18:40:17 +01:00
liach b00c92199f
Map new classes, staging (#1122)
Map new classes, staging
2020-02-24 20:14:56 +00:00
modmuss50 9b88b3c3e8 20w06a 2020-02-05 17:27:03 +00:00
Tae Lim Kook 80cf8e5ada Names for some fields and methods in net.minecraft.data.server (#1021)
* Rename Gson fields in some classes to GSON

* Name some methods in RecipesProvider

Also a param fix in InventoryChangedCriterion's constructor.

* Rename field in LootTablesProvider

* Rename some methods in AbstractTagProvider

* Name some methods in AdventureTabAdvancementGenerator

* Rename some fields and methods for BlockLootTableGenerator

* Rename some fields and methods in EntityToolTableGenerator and EntityType

* Rename fields in FishingLootTableGenerator

These were loot condition constants checking for biomes.

* Rename fields and methods in HusbandryTabAdvancementGenerator

* method_10422 -> RecipesProvider.requireEnteringFluid

* Rename parameters to SnbtProvider.CompressedData

* Rename some fields and methods in NbtProvider

* method_10422 -> ItemListProvider#toJson

* NEED_ and REQUIRE_ -> NEEDS

* Remove 'loot table' and 'block' in BlockLootTableGenerator method names

Suggested by liach.

* Fix names in EntityLootTableGenerator to align with standards
2020-01-03 20:52:06 +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