- IC2 integration will now try to override recipes, if it can.

- Fixed a couple tiny things
This commit is contained in:
Stan Hebben committed 2015-09-06 08:48:25 +02:00
1 parent 132fe38342
commit 4b8af78057
5 files changed
+29 -16

No files matched your search

@@ -17,11 +17,9 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent;
import cpw.mods.fml.common.event.FMLServerStoppedEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import cpw.mods.fml.common.registry.VillagerRegistry;
import cpw.mods.fml.relauncher.Side;
import java.io.File;
import java.util.Set;
import minetweaker.MineTweakerAPI;
import minetweaker.MineTweakerImplementationAPI;
@@ -49,7 +47,6 @@ import minetweaker.runtime.IScriptProvider;
import minetweaker.runtime.providers.ScriptProviderCascade;
import minetweaker.runtime.providers.ScriptProviderCustom;
import minetweaker.runtime.providers.ScriptProviderDirectory;
import net.minecraft.item.Item;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.MinecraftForge;
@@ -59,7 +56,7 @@ import net.minecraftforge.common.MinecraftForge;
*
* @author Stan Hebben
*/
@Mod(modid = MineTweakerMod.MODID, version = "3.0.9B")
@Mod(modid = MineTweakerMod.MODID, version = "3.0.10")
public class MineTweakerMod {
public static final String MODID = "MineTweaker3";
public static final String MCVERSION = "1.7.10";
@@ -1,6 +1,7 @@
package minetweaker.mods.ic2;
import ic2.api.recipe.IMachineRecipeManager;
import ic2.api.recipe.IMachineRecipeManagerExt;
import java.util.Arrays;
import minetweaker.MineTweakerAPI;
import minetweaker.OneWayAction;
@@ -29,7 +30,11 @@ public class MachineAddRecipeAction extends OneWayAction {
@Override
public void apply() {
try {
machine.addRecipe(input, tag, output);
if (machine instanceof IMachineRecipeManagerExt) {
((IMachineRecipeManagerExt) machine).addRecipe(input, tag, true, output);
} else {
machine.addRecipe(input, tag, output);
}
} catch (RuntimeException ex) {
MineTweakerAPI.logError(ex.getMessage());
}
+18 -9
View File
@@ -82,32 +82,41 @@
<h2>Latest version</h2>
<ul>
<li><a href="/download/MineTweaker3-1.6.4-3.0.9C.jar">MineTweaker 3.0.9C for Minecraft 1.6.4</a></li>
<li><a href="/download/MineTweaker3-1.7.2-3.0.9C.jar">MineTweaker 3.0.9C for Minecraft 1.7.2</a></li>
<li><a href="/download/MineTweaker3-1.7.10-3.0.9C.jar">MineTweaker 3.0.9C for Minecraft 1.7.10</a></li>
<li><a href="/download/MineTweaker3-1.7.10-3.0.10.jar">MineTweaker 3.0.10 for Minecraft 1.7.10</a></li>
<li><a href="/download/MineTweaker3-1.8-3.0.10.jar">MineTweaker 3.0.10 for Minecraft 1.8</a></li>
</ul>
<h3>Development versions</h3>
<h4>Basic version (without mod support)</h4>
<p>This version is recommended for development, as it won't need you to provide the libraries for every mod in it.</p>
<ul>
<li><a href="/download/MineTweaker3-Dev-1.6.4-3.0.9C.jar">MineTweaker 3.0.9C (Dev, core) for Minecraft 1.6.4</a></li>
<li><a href="/download/MineTweaker3-Dev-1.7.2-3.0.9C.jar">MineTweaker 3.0.9C (Dev, core) for Minecraft 1.7.2</a></li>
<li><a href="/download/MineTweaker3-Dev-1.7.10-3.0.9C.jar">MineTweaker 3.0.9C (Dev, core) for Minecraft 1.7.10</a></li>
<li><a href="/download/MineTweaker3-Dev-1.7.10-3.0.10.jar">MineTweaker 3.0.10 (Dev, core) for Minecraft 1.7.10</a></li>
<li><a href="/download/MineTweaker3-Dev-1.8-3.0.10.jar">MineTweaker 3.0.10 (Dev, core) for Minecraft 1.8</a></li>
</ul>
<h4>Full version (with mod support)</h4>
<p>This version includes all mod support. You may need the development versions of the supported mods as well.</p>
<ul>
<li><a href="/download/MineTweaker3-Dev-Full-1.6.4-3.0.9C.jar">MineTweaker 3.0.9C (Dev, full) for Minecraft 1.6.4</a></li>
<li><a href="/download/MineTweaker3-Dev-Full-1.7.2-3.0.9C.jar">MineTweaker 3.0.9C (Dev, full) for Minecraft 1.7.2</a></li>
<li><a href="/download/MineTweaker3-Dev-Full-1.7.10-3.0.9C.jar">MineTweaker 3.0.9C (Dev, full) for Minecraft 1.7.10</a></li>
<li><a href="/download/MineTweaker3-Dev-Full-1.7.10-3.0.10.jar">MineTweaker 3.0.10 (Dev, full) for Minecraft 1.7.10</a></li>
<li><a href="/download/MineTweaker3-Dev-Full-1.8-3.0.10.jar">MineTweaker 3.0.10 (Dev, full) for Minecraft 1.8</a></li>
</ul>
<p>What's changed? <a href="http://minetweaker3.powerofbytes.com/wiki/Changelog">Changelog</a></p>
<h2>Archived versions</h2>
<h3>Version 3.0.9C</h3>
<ul>
<li><a href="/download/MineTweaker3-1.6.4-3.0.9C.jar">MineTweaker 3.0.9C for Minecraft 1.6.4</a></li>
<li><a href="/download/MineTweaker3-1.7.2-3.0.9C.jar">MineTweaker 3.0.9C for Minecraft 1.7.2</a></li>
<li><a href="/download/MineTweaker3-1.7.10-3.0.9C.jar">MineTweaker 3.0.9C for Minecraft 1.7.10</a></li>
<li><a href="/download/MineTweaker3-Dev-1.6.4-3.0.9C.jar">MineTweaker 3.0.9C (Dev, core) for Minecraft 1.6.4</a></li>
<li><a href="/download/MineTweaker3-Dev-1.7.2-3.0.9C.jar">MineTweaker 3.0.9C (Dev, core) for Minecraft 1.7.2</a></li>
<li><a href="/download/MineTweaker3-Dev-1.7.10-3.0.9C.jar">MineTweaker 3.0.9C (Dev, core) for Minecraft 1.7.10</a></li>
<li><a href="/download/MineTweaker3-Dev-Full-1.6.4-3.0.9C.jar">MineTweaker 3.0.9C (Dev, full) for Minecraft 1.6.4</a></li>
<li><a href="/download/MineTweaker3-Dev-Full-1.7.2-3.0.9C.jar">MineTweaker 3.0.9C (Dev, full) for Minecraft 1.7.2</a></li>
<li><a href="/download/MineTweaker3-Dev-Full-1.7.10-3.0.9C.jar">MineTweaker 3.0.9C (Dev, full) for Minecraft 1.7.10</a></li>
</ul>
<h3>Version 3.0.9B</h3>
<ul>
<li><a href="/download/MineTweaker3-1.6.4-3.0.9B.jar">MineTweaker 3.0.9B for Minecraft 1.6.4</a></li>
+2 -1
View File
@@ -93,7 +93,8 @@
<div class="col-md-4">
<h2>Downloads</h2>
<p>Installation: it's a forge mod. Make sure you have Forge installed and put it in your mods folder. No configuration needed, just follow the wiki tutorials to start scripting!</p>
<p><a href="/download/MineTweaker3-1.7.10-3.0.9C.jar"><i class="glyphicon glyphicon-download-alt"></i> 3.0.10 for Minecraft 1.7.10</a></p>
<p><a href="/download/MineTweaker3-1.7.10-3.0.10.jar"><i class="glyphicon glyphicon-download-alt"></i> 3.0.10 for Minecraft 1.7.10</a></p>
<p><a href="/download/MineTweaker3-1.8-3.0.10.jar"><i class="glyphicon glyphicon-download-alt"></i> 3.0.10 for Minecraft 1.8</a></p>
<p><a href="/downloads.html">Other downloads</a> | <a href="/wiki/Changelog">Changelog</a></p>
</div>
<div class="col-md-4">
+2 -1
View File
@@ -27,5 +27,6 @@ ext.projects1710 = [
ext.forgeVersion18 = "1.8-11.14.3.1450"
ext.projects18 = [
'MineTweaker3-MC18-Main'
'MineTweaker3-MC18-Main',
'MineTweaker3-MC18-Mod-NEI'
]