More balance settings and GT Ore integration #36
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,4 +35,4 @@ addon.local.gradle | |
| addon.local.gradle.kts | ||
| addon.late.local.gradle | ||
| addon.late.local.gradle.kts | ||
| layout.json | ||
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package twilightforest.gt_integration; | ||
|
|
||
| import net.minecraft.block.Block; | ||
| import net.minecraft.world.World; | ||
|
|
||
| public class GT_Integration_Utils { | ||
|
|
||
| static GT_OrePlacer orePlacer; | ||
|
|
||
| public static void init() { | ||
| // Create worker obj | ||
| orePlacer = new GT_OrePlacer(); | ||
|
|
||
| } | ||
|
|
||
| public static boolean isInit() { | ||
| return orePlacer != null; | ||
| } | ||
|
|
||
| public static boolean doPlaceGTOre(World aWorld, int aX, int aY, int aZ, Block mcOreBlock) { | ||
| if (!isInit()) { | ||
| return false; | ||
| } | ||
| return orePlacer.placeGTOre(aWorld, aX, aY, aZ, mcOreBlock); | ||
| } | ||
|
|
||
| public static GT_OrePlacer getOrePlacer() { | ||
| return orePlacer; | ||
| } | ||
|
|
||
| } | ||
|
Comment on lines
1
to
27
There was a problem hiding this comment. You should reduce the visibility of this class's members.
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| package twilightforest.gt_integration; | ||
|
|
||
| import net.minecraft.block.Block; | ||
| import net.minecraft.init.Blocks; | ||
| import net.minecraft.world.World; | ||
|
|
||
| import gregtech.common.blocks.GT_TileEntity_Ores; | ||
| import twilightforest.TwilightForestMod; | ||
|
|
||
| public class GT_OrePlacer { | ||
|
|
||
| public int getMappedGTMetaForOre(Block mOre) { | ||
|
Comment on lines
+1
to
+12
There was a problem hiding this comment.
|
||
|
|
||
| if (mOre == Blocks.coal_ore) { | ||
| return TwilightForestMod.GT_coalOreMeta; | ||
| } | ||
|
|
||
| if (mOre == Blocks.iron_ore) { | ||
| return TwilightForestMod.GT_ironOreMeta; | ||
|
|
||
| } | ||
| if (mOre == Blocks.gold_ore) { | ||
| return TwilightForestMod.GT_goldOreMeta; | ||
| } | ||
|
|
||
| if (mOre == Blocks.redstone_ore) { | ||
| return TwilightForestMod.GT_redstoneOreMeta; | ||
| } | ||
|
|
||
| if (mOre == Blocks.lapis_ore) { | ||
| return TwilightForestMod.GT_lapisOreMeta; | ||
| } | ||
|
|
||
| if (mOre == Blocks.emerald_ore) { | ||
| return TwilightForestMod.GT_emeraldOreMeta; | ||
| } | ||
| if (mOre == Blocks.diamond_ore) { | ||
| return TwilightForestMod.GT_diamondOreMeta; | ||
| } | ||
|
|
||
| return -1; | ||
| } | ||
|
|
||
| public boolean placeGTOre(World aWorld, int aX, int aY, int aZ, Block mcOreBlock) { | ||
|
|
||
| int mappedMeta = getMappedGTMetaForOre(mcOreBlock); | ||
| if (mappedMeta <= 0) { | ||
| return false; | ||
| } | ||
| return GT_TileEntity_Ores.setOreBlock(aWorld, aX, aY, aZ, mappedMeta, TwilightForestMod.GT_useSmallOres, true); | ||
|
|
||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It appears this function isn't only used when generating a feature (as its name would suggest) but also when looking up which feature should exist in a given region.
Changing the configurated change post-worldgen affects functionality that check against existing features such as the magic map.
Is this intended? If so you might want to document the caveat that this config isn't meant to be modified on an existing world.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, definitely need a warning, I was worried that this would happen