Create new 1.15 port branch from mc-1.12 baseline#6
Draft
SimonBaars wants to merge 6 commits into
Draft
Conversation
- StructureUtils.java: Vec3d fields xCoord/yCoord/zCoord → x/y/z - StructureUtils.java: world.spawnEntityInWorld() → world.spawnEntity() - StructureUtils.java: tileEntity.setWorldObj() → tileEntity.setWorld() (2 occurrences) - SchematicStructure.java: TileEntity.func_190200_a() → TileEntity.create() (2 occurrences) - SchematicStructure.java: Minecraft.getMinecraft().theWorld → .world (2 occurrences) - BlockPlaceHandler.java: Minecraft.getMinecraft().theWorld → .world (2 occurrences) Co-authored-by: Simon <SimonBaars@users.noreply.github.com>
- onBlockActivated: removed ItemStack heldItem parameter (BlockStructure, BlockLiveStructure) - thePlayer -> player, theWorld -> world across all core files - addChatMessage -> sendMessage across all core files - null ItemStack checks -> .isEmpty() in BlockStructure - onBlockPlaced -> getStateForPlacement in LiveStructureRemover - GameRegistry.registerBlock -> GameRegistry.register + ItemBlock registration (~882 calls in IMSM.java) - @mod version 1.8 -> 1.11 - FMLCommonHandler.instance().bus().register -> MinecraftForge.EVENT_BUS.register - Removed FMLCommonHandler import, added ItemBlock import Co-authored-by: Simon <SimonBaars@users.noreply.github.com>
worldgeneration/ changes: - BlockBigWorld, BlockCloud, BlockCheckerboard: Remove ItemStack heldItem param from onBlockActivated, fix thePlayer->player, addChatMessage->sendMessage, null checks to isEmpty(), remove unused ItemStack import - BlockAtlantis: Update onBlockActivated signature to include EnumHand, add @OverRide, add EnumHand/TextComponentString imports, sendChatMessage->sendMessage(new TextComponentString(...)), null check to isEmpty() - MazeGenerator: theWorld->world, thePlayer->player, addChatMessage->sendMessage - LiveCommand, MazeCommand, RideCommand: thePlayer->player, addChatMessage->sendMessage structures/ changes: - RemoverLast: onBlockPlaced->getStateForPlacement userstructures/ changes: - BlockUserStructure: Remove ItemStack heldItem param, fix thePlayer->player, theWorld->world, addChatMessage->sendMessage, null checks to isEmpty(), remove unused ItemStack import - BlockUnlimited: Remove ItemStack heldItem param, remove unused ItemStack import - BlockRuntimeStructure: getSubBlocks signature change (remove Item param, List->NonNullList), use Item.getItemFromBlock(this), add NonNullList import - PMCParser: GameRegistry.registerBlock->GameRegistry.register with ItemBlock, add ItemBlock import - StructureCreatorUser: theWorld->world Co-authored-by: Simon <SimonBaars@users.noreply.github.com>
…lockRemover - Update ICommand interface: getCommandName->getName, processCommand->execute, etc. - Fix CreativeTabs.getTabIconItem() to return ItemStack instead of Item - Fix provider.getHasNoSky() -> provider.hasSkyLight() - Fix chunk.setChunkModified() -> chunk.markDirty() - Fix BlockRemover to use getStateForPlacement - Update build.gradle to MC 1.11.2-13.20.1.2386 Co-authored-by: Simon <SimonBaars@users.noreply.github.com>
- Update build.gradle: Forge 1.12.2-14.23.5.2847, ForgeGradle 2.3, Gradle 4.9 - Replace GameRegistry.register() with ForgeRegistries.BLOCKS/ITEMS.register() - Comment out GameRegistry.addRecipe() (recipes now JSON in 1.12) - Fix MapColor.getBlockColor() API change - Fix ForgeRegistries import path for 1.12 - Update mod version to 1.12 Co-authored-by: Simon <SimonBaars@users.noreply.github.com>
Co-authored-by: Simon <SimonBaars@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
mc-1.15-fixedfrom themc-1.12history instead of the old divergentmc-1.15branch historyTesting
JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 ./gradlew compileJavagit diff --stat mc-1.15..HEADis empty, so the new branch content matches the existing 1.15 ported treegit merge-base mc-1.12 mc-1.15-fixedequalsmc-1.12, confirming the new branch is based onmc-1.12