Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix crash with ic2 #77 #78

Merged
merged 2 commits into from
Jan 15, 2023
Merged

fix crash with ic2 #77 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afde3c2
fix crash with ic2 #77
maggi373 Jan 15, 2023
ab77661
bump version
maggi373 Jan 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ FMP_version=1.2.0.347
CCLIB_version=1.1.3.141
NEI_version=1.0.5.120
CCC_version=1.0.7.48
mod_version=9.10.23
alt_version=9, 10, 23
mod_version=9.10.24
alt_version=9, 10, 24
9 changes: 7 additions & 2 deletions src/main/java/mekanism/common/integration/OreDictManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,14 @@ public static void init() {
RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(MekanismItems.OtherDust, 4, 1));
}

if (OreDictionary.getOres("itemRubber").size() > 0) {
if (OreDictionary.getOres("itemRawRubber").size() > 0) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not use !OreDictionary.getOres("itemRawRubber").isEmpty() instead?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well i'm lazy and didnt bothered to change that?, does the same anyways.

Copy link
Member Author

@maggi373 maggi373 Jan 15, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

feel free to change it, remember to test it aswell

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright, I'll eventually clean up the code in future commits

for (ItemStack ore : OreDictionary.getOres("woodRubber")) {
RecipeHandler.addPrecisionSawmillRecipe(StackUtils.size(ore, 1), new ItemStack(Blocks.planks, 4), StackUtils.size(OreDictionary.getOres("itemRawRubber").get(0), 2), 1F); }
RecipeHandler.addPrecisionSawmillRecipe(StackUtils.size(ore, 1), new ItemStack(Blocks.planks, 4), StackUtils.size(OreDictionary.getOres("itemRawRubber").get(0), 2), 1F);
}
} else if (OreDictionary.getOres("itemRubber").size() > 0) {
for (ItemStack ore : OreDictionary.getOres("woodRubber")) {
RecipeHandler.addPrecisionSawmillRecipe(StackUtils.size(ore, 1), new ItemStack(Blocks.planks, 4), StackUtils.size(OreDictionary.getOres("itemRubber").get(0), 2), 1F);
}
}

for (ItemStack ore : OreDictionary.getOres("dustSulfur")) {
Expand Down