diff --git a/README.md b/README.md index c0e32b5..2ac88ba 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ the [release page](https://minecraft.curseforge.com/projects/just-enough-calcula - [x] Forestry (`?` button may overlap with the fluid tank. Click carefully) - [x] Avaritia (`?` button may be covered by the NEI search bar) - [x] GT++ (support GT++ 1.7.05.68 (GTNH 2.1.0.0), have not tested old versions) + - [x] Thaumcraft (no aspect) - [ ] AE2 - [ ] Others - [x] Item from NEI item panel @@ -51,9 +52,8 @@ Tutorial links: ## TODO -- add new button to transfer the recipe. +- ~~add new button to transfer the recipe.~~ - [ ] convert GT item fluid to fluid -- [ ] TC ## Known Issues diff --git a/README_CN.md b/README_CN.md index 99ef584..7e02c62 100644 --- a/README_CN.md +++ b/README_CN.md @@ -28,6 +28,7 @@ This mod is focused on calculation, so you might find it powerful and high perfo - [x] Forestry (`?` 按钮可能与流体重叠,不是很好点到) - [x] Avaritia (`?` 按钮可能会被NEI搜索栏遮盖) - [x] GT++ (支持 GT++ 1.7.05.68 版本(GTNH 2.1.0.0),老版本没有测试过) + - [x] Thaumcraft (不包括要素) - [ ] AE2(目前没办法,需要 AE2 作者支持 - [ ] 其它 - [x] 从 NEI 物品列表抓取物品 diff --git a/build.gradle b/build.gradle index 25f998b..5a794e7 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ java { version = "${mc_version}-${proj_version}" group = "me.towdium.jecalculation" -archivesBaseName = "jecalculation" +archivesBaseName = "JustEnoughCalculation" minecraft { version = '1.7.10-10.13.4.1614-1.7.10' diff --git a/libs/GT-PlusPlus-1.7.05.68.jar b/libs/GT-PlusPlus-1.7.05.68.jar deleted file mode 100644 index caf54f3..0000000 Binary files a/libs/GT-PlusPlus-1.7.05.68.jar and /dev/null differ diff --git a/libs/NotEnoughItems-1.7.10-2.1.2-GTNH-universal.jar b/libs/NotEnoughItems-1.7.10-2.1.5-GTNH-universal.jar similarity index 66% rename from libs/NotEnoughItems-1.7.10-2.1.2-GTNH-universal.jar rename to libs/NotEnoughItems-1.7.10-2.1.5-GTNH-universal.jar index 8796bd4..2fab1a1 100644 Binary files a/libs/NotEnoughItems-1.7.10-2.1.2-GTNH-universal.jar and b/libs/NotEnoughItems-1.7.10-2.1.5-GTNH-universal.jar differ diff --git a/libs/gregtech-5.09.34.16.jar b/libs/gregtech-5.09.34.16.jar deleted file mode 100644 index 29753bc..0000000 Binary files a/libs/gregtech-5.09.34.16.jar and /dev/null differ diff --git a/src/main/java/me/towdium/jecalculation/nei/Adapter.java b/src/main/java/me/towdium/jecalculation/nei/Adapter.java index 8c2a42a..bd2a895 100644 --- a/src/main/java/me/towdium/jecalculation/nei/Adapter.java +++ b/src/main/java/me/towdium/jecalculation/nei/Adapter.java @@ -43,6 +43,10 @@ public class Adapter { JustEnoughCalculation.logger.info("EnderIO installed"); adapters.add(new EnderIO()); } + if (Loader.isModLoaded("thaumcraftneiplugin")) { + adapters.add(new Thaum()); + JustEnoughCalculation.logger.info("Thaumcraft installed"); + } JustEnoughCalculation.logger.info("=====Just Enough Calculation Init Finish====="); } diff --git a/src/main/java/me/towdium/jecalculation/nei/adapter/Thaum.java b/src/main/java/me/towdium/jecalculation/nei/adapter/Thaum.java new file mode 100644 index 0000000..ac51b55 --- /dev/null +++ b/src/main/java/me/towdium/jecalculation/nei/adapter/Thaum.java @@ -0,0 +1,58 @@ +package me.towdium.jecalculation.nei.adapter; + +import codechicken.nei.recipe.IRecipeHandler; +import cpw.mods.fml.common.registry.GameData; +import net.minecraft.item.ItemStack; + +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +@ParametersAreNonnullByDefault +public class Thaum implements IAdapter { + @Override + public Set getAllOverlayIdentifier() { + return new HashSet<>( + Arrays.asList("arcaneshapedrecipes", "arcaneshapelessrecipes", "aspectsRecipe", "cruciblerecipe", + "infusionCrafting")); + } + + private final static Set> defaultHandlers; + + static { + List handlers = Stream.of("ArcaneShapedRecipeHandler", "ArcaneShapelessRecipeHandler", + "AspectRecipeHandler", "CrucibleRecipeHandler", "InfusionRecipeHandler") + .map(name -> "com.djgiannuzz.thaumcraftneiplugin.nei.recipehandler." + name) + .collect(Collectors.toList()); + defaultHandlers = new HashSet<>(); + for (String handler : handlers) { + try { + defaultHandlers.add(Class.forName(handler)); + } catch (ClassNotFoundException ignored) { + + } + } + } + + @Override + public void handleRecipe(IRecipeHandler recipe, int index, List inputs, List outputs) { + if (defaultHandlers.stream().anyMatch(handler -> handler.isInstance(recipe))) { + // remove all aspects + Iterator it = inputs.iterator(); + while (it.hasNext()) { + Object[] items = it.next(); + for (Object item : items) { + if (item instanceof ItemStack) { + String name = GameData.getItemRegistry().getNameForObject(((ItemStack) item).getItem()); + if ("thaumcraftneiplugin:Aspect".equals(name)) { + it.remove(); + break; + } + } + } + } + + } + } +} diff --git a/src/main/java/me/towdium/jecalculation/network/ClientHandler.java b/src/main/java/me/towdium/jecalculation/network/ClientHandler.java index 6c0a055..7fa53de 100644 --- a/src/main/java/me/towdium/jecalculation/network/ClientHandler.java +++ b/src/main/java/me/towdium/jecalculation/network/ClientHandler.java @@ -3,9 +3,11 @@ package me.towdium.jecalculation.network; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import me.towdium.jecalculation.command.JecaCommand; import me.towdium.jecalculation.data.Controller; import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.event.Handlers; +import net.minecraftforge.client.ClientCommandHandler; import static me.towdium.jecalculation.gui.JecaGui.keyOpenGuiCraft; import static me.towdium.jecalculation.gui.JecaGui.keyOpenGuiMath; @@ -19,8 +21,7 @@ public class ClientHandler { public void initPost() { ILabel.initServer(); - // May crash: `NoSuchMethodError`. - // ClientCommandHandler.instance.registerCommand(new JecaCommand()); + ClientCommandHandler.instance.registerCommand(new JecaCommand()); ILabel.initClient(); Controller.loadFromLocal(); } diff --git a/src/main/java/me/towdium/jecalculation/utils/ClientUtils.java b/src/main/java/me/towdium/jecalculation/utils/ClientUtils.java index 4a9b3f3..c25ef03 100644 --- a/src/main/java/me/towdium/jecalculation/utils/ClientUtils.java +++ b/src/main/java/me/towdium/jecalculation/utils/ClientUtils.java @@ -10,7 +10,11 @@ public class ClientUtils { } public static void playClickSound(float pitchIn) { - mc().getSoundHandler().playSound( - PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), pitchIn)); + try { + mc().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), pitchIn)); + } catch (Exception e) { + // why may crash ?? + e.printStackTrace(); + } } } diff --git a/src/main/java/me/towdium/jecalculation/utils/Utilities.java b/src/main/java/me/towdium/jecalculation/utils/Utilities.java index 8895ba8..60da213 100644 --- a/src/main/java/me/towdium/jecalculation/utils/Utilities.java +++ b/src/main/java/me/towdium/jecalculation/utils/Utilities.java @@ -11,7 +11,6 @@ import cpw.mods.fml.relauncher.SideOnly; import me.towdium.jecalculation.JustEnoughCalculation; import me.towdium.jecalculation.polyfill.NBTHelper; import me.towdium.jecalculation.utils.wrappers.Pair; -import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.Item; @@ -21,7 +20,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.text.WordUtils; @@ -144,7 +142,7 @@ public class Utilities { } public static EntityClientPlayerMP getPlayer() { - return Objects.requireNonNull(Minecraft.getMinecraft().thePlayer); + return Objects.requireNonNull(ClientUtils.mc().thePlayer); } @@ -281,12 +279,12 @@ public class Utilities { public static List wrap(String s, int width) { return new TextWrapper() - .wrap(s, Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode(), + .wrap(s, ClientUtils.mc().getLanguageManager().getCurrentLanguage().getLanguageCode(), i -> TextWrapper.renderer.getCharWidth(i), width); } static class TextWrapper { - static FontRenderer renderer = Minecraft.getMinecraft().fontRenderer; + static FontRenderer renderer = ClientUtils.mc().fontRenderer; String str; BreakIterator it;