Darkhax-Minecraft / Bookshelf

A library mod which adds additional code support beyond what is provided by Forge.
GNU Lesser General Public License v2.1
145 stars 39 forks source link

1.61.1 Upgrade #143

Closed puggan closed 4 years ago

puggan commented 4 years ago

Started with a 1.16.1 upgrade, so put it here as a Draft PR, in-case someone was interested in how its going.

puggan commented 4 years ago

Help needed: Can't find a replacement for ItemTags.getGeneration()

https://github.com/Darkhax-Minecraft/Bookshelf/blob/bffcd767dddb9de3f15daaca1415f4d2411b7051/src/main/java/net/darkhax/bookshelf/crafting/item/IngredientPredicate.java#L103

puggan commented 4 years ago

Help Needed Can't find a replacement fro ForgeRegistries.MOD_DIMENSIONS

https://github.com/Darkhax-Minecraft/Bookshelf/blob/62e3cf7c4ee4d692a556196fc8d0c7eacb37b0eb/src/main/java/net/darkhax/bookshelf/util/MCJsonUtils.java#L191-L194

Darkhax commented 4 years ago

Help Needed Can't find a replacement fro ForgeRegistries.MOD_DIMENSIONS

https://github.com/Darkhax-Minecraft/Bookshelf/blob/62e3cf7c4ee4d692a556196fc8d0c7eacb37b0eb/src/main/java/net/darkhax/bookshelf/util/MCJsonUtils.java#L191-L194

Dimension related code will need to be nuked. It no longer exists.

puggan commented 4 years ago

Now I checked all that I could manage by myself. here is a list of the stuff that still red in my editor:

java/net/darkhax/bookshelf/crafting/item/IngredientPredicate.java refers ItemTags.getGeneration

java/net/darkhax/bookshelf/loot/condition/*.java 1.15: /net/minecraft/world/storage/loot/conditions/ILootCondition.java 1.16: /net/minecraft/loot/conditions/ILootCondition.java subclass AbstractSerializer replaced with LootConditionType func_230419_b_();

java/net/darkhax/bookshelf/network/NetworkHelper.java refers Dimension

java/net/darkhax/bookshelf/registry/RegistryHelper.java refers BiomeProviderType, IBiomeProviderSettings, ChunkGeneratorType, GenerationSettings, AbstractSerializer

java/net/darkhax/bookshelf/util/MCJsonUtils.java refers ModDimension private LootTableManager.GSON_INSTANCE, is already in accesstransformer.cfg

java/net/darkhax/bookshelf/util/RenderUtils.java private BlockModelRenderer.renderQuadsFlat, is already in accesstransformer.cfg

java/net/darkhax/bookshelf/Bookshelf.java refering to java/net/darkhax/bookshelf/loot/condition/*.java

puggan commented 4 years ago

I got it to build, the last 6 commits are "unsafe", nuked/removed stuff and rewrote loot conditions.

puggan commented 4 years ago

Error when entering a world:

java.util.concurrent.ExecutionException: java.lang.IllegalStateException: Missing required tags: items:forge:axes,items:forge:hoes,items:forge:pickaxes,items:forge:shovels,items:forge:swords,items:forge:tools/axes,items:forge:tools/hoes,items:forge:tools/pickaxes,items:forge:tools/shovels,items:forge:tools/swords

Darkhax commented 4 years ago

I decided to do the port separately. There was far too much going on in this PR, especially with the change in MCP mappings and many of the changes I wanted to make.