indev 1.3.1-6

.classpath

@@ -66,6 +66,6 @@
 	<classpathentry exported="true" kind="lib" path="/home/sven/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl-platform/2.9.1/aa9aae879af8eb378e22cfc64db56ec2ca9a44d1/lwjgl-platform-2.9.1-natives-linux.jar"/>
 	<classpathentry exported="true" kind="lib" path="/home/sven/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl-platform/2.9.1/2d12c83fdfbc04ecabf02c7bc8cc54d034f0daac/lwjgl-platform-2.9.1-natives-osx.jar"/>
 	<classpathentry exported="true" kind="lib" path="/home/sven/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.4.1558-1.7.10/start"/>
-	<classpathentry kind="lib" path="/home/sven/mcdev/JMOD/build/dirtyArtifacts/forgeBin-1.7.10-10.13.4.1558-1.7.10.jar" sourcepath="/home/sven/mcdev/simods/si.core/build/dirtyArtifacts/forgeSrc-1.7.10-10.13.4.1558-1.7.10-sources.jar"/>
+	<classpathentry kind="lib" path="build/dirtyArtifacts/forgeBin-1.7.10-10.13.4.1558-1.7.10.jar" sourcepath="build/dirtyArtifacts/forgeSrc-1.7.10-10.13.4.1558-1.7.10-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

buildme

@@ -0,0 +1,5 @@
+#!/bin/sh
+rm build/libs/*
+./gradlew build
+cp build/libs/jmod-*-complete.jar ~/.minecraftdevtest/mods
+#cp ~/mcdev/Survival-Industry-dev/Documents\ and\ Notes/Resource\ Packs/Survival\ Industry ~/.minecraftdevtest/resourcepacks -R

src/main/java/com/jeffpeng/jmod/JMOD.java

@@ -21,6 +21,7 @@
 import com.jeffpeng.jmod.primitives.ModScriptObject;
 import com.jeffpeng.jmod.registry.BlockMaterialRegistry;
 import com.jeffpeng.jmod.util.ForgeDeepInterface;
+import com.jeffpeng.jmod.util.ModId;
 
 import cpw.mods.fml.common.ProgressManager;
 import cpw.mods.fml.common.ProgressManager.ProgressBar;
@@ -78,15 +79,19 @@ public JMOD() {
 		JMODLoader.initPlugins();
 	}
 
+	public void forgeLoaderHook(){
+
+	}
+
 	public void on(FMLConstructionEvent event) {
 		if(event.getSide().isServer()) isServer = true;
 		BlacklistCraftingResults.init();
 		BlacklistCraftingResults.getInstance().blacklistDomain("RotaryCraft");
 		DEEPFORGE = new ForgeDeepInterface();
-//		JMODLoader.loadPluginsIntoClassPath();
 		JMODLoader.constructMods();
 		JMODLoader.inject();
 		JMODLoader.runScripts();
+		ModId.init();
 
 		ProgressBar bar = ProgressManager.push("Initializing JMODs", JMODLoader.getModList().size());
 		for(Map.Entry<String,JMODContainer> entry : JMODLoader.getModList().entrySet()){

src/main/java/com/jeffpeng/jmod/JMODLoader.java

@@ -211,6 +211,7 @@ protected static void inject(){
 
 	protected static void runScripts(){
 		for(Map.Entry<String,JMODContainer> entry : modList.entrySet()){
+			JMOD.LOG.info("'###rsc " + entry.getValue().getModId());
 			entry.getValue().getMod().runScripts();
 		}
 	}

src/main/java/com/jeffpeng/jmod/JMODRepresentation.java

@@ -23,6 +23,7 @@
 import com.jeffpeng.jmod.actions.SetBlockProperties;
 import com.jeffpeng.jmod.crafting.AnvilHandler;
 import com.jeffpeng.jmod.crafting.DropHandler;
+import com.jeffpeng.jmod.crafting.FuelHandler;
 import com.jeffpeng.jmod.crafting.ToolRepairRecipe;
 import com.jeffpeng.jmod.descriptors.ColorDescriptor;
 import com.jeffpeng.jmod.descriptors.ItemStackSubstituteDescriptor;
@@ -61,6 +62,7 @@ public class JMODRepresentation implements IEventObject {
 	private boolean scriptingFinished = false;
 	private boolean scriptingErrored = false;
 	protected List<IStagedObject> stageables = new ArrayList<>();
+	public FuelHandler fuelHandler = new FuelHandler();
 
 
 
@@ -108,6 +110,7 @@ public JMODRepresentation(JMODInfo modinfo, boolean zipmod) {
 	public void runScripts() {
 		log.info("Scripts for " + this.getModId());
 		script = new JScript(instance);
+		log.info("Scripts for " + this.getModId());
 		for (String entry : modinfo.scripts) {
 			script.evalScript(entry);
 		}
@@ -126,6 +129,7 @@ public void on(FMLConstructionEvent event) {
 	public void on(FMLPreInitializationEvent event) {
 		if (!JMOD.isDevVersion())
 			lib.checkDependencies();
+		GameRegistry.registerFuelHandler(fuelHandler);
 	}
 
 	@SuppressWarnings("unchecked")

src/main/java/com/jeffpeng/jmod/Lib.java

@@ -71,18 +71,31 @@ public static boolean chance(int percentage){
 		return rand <= percentage;
 	}
 
+	public void displayWarningMessage(String title, String message){
+		if(!JMOD.isServer()){
+			JFrame frame = new JFrame();
+			JOptionPane.showMessageDialog(frame, message,title,JOptionPane.WARNING_MESSAGE);
+
+		}
+		log.warn(message);
+	}
+
+	public void displayErrorMessage(String title, String message){
+		if(!JMOD.isServer()){
+			JFrame frame = new JFrame();
+			JOptionPane.showMessageDialog(frame, message,title,JOptionPane.ERROR_MESSAGE);
+		}
+		log.error(message);
+		throw new RuntimeException(message);
+	}
+
 	@SuppressWarnings("unchecked")
 	public void checkDependencies(){
 		for(Map.Entry<String,String> entry : ((Map<String,String>) config.get("moddependencies")).entrySet()){
 			if(!Loader.isModLoaded(entry.getKey())){
 				String message = "The mod " + entry.getValue() + " is missing!\n\n" + owner.getModName() + " is not supposed to run without it. We strongly recommend installing it.\n\nIf you do not, these possible problems are all yours to keep:\n\n- Broken progression\n- Missing blocks and items\n- Ruined game experience\n- Horrible crashes of doom\n- Feeling miserable\n\nWe will not care, and will not help, but keep bugging you with this window.";
-				if(!JMOD.isServer()){
-					JFrame frame = new JFrame();
-					JOptionPane.showMessageDialog(frame, message,"The mod " + entry.getValue() + " is missing!",JOptionPane.WARNING_MESSAGE);
-				}
-
-				log.warn(message);
-
+				String title = "The mod " + entry.getValue() + " is missing!";
+				displayWarningMessage(title,message);
 			}
 		}
 	}

src/main/java/com/jeffpeng/jmod/actions/AddItem.java

@@ -15,6 +15,7 @@
 import com.jeffpeng.jmod.interfaces.IArmor;
 import com.jeffpeng.jmod.interfaces.IItem;
 import com.jeffpeng.jmod.interfaces.IItemColor;
+import com.jeffpeng.jmod.interfaces.ISettingsProcessor;
 import com.jeffpeng.jmod.interfaces.ITool;
 import com.jeffpeng.jmod.primitives.BasicAction;
 import com.jeffpeng.jmod.types.items.CoreFood;
@@ -112,6 +113,11 @@ public boolean on(FMLPreInitializationEvent event){
 			((Item) instance).setTextureName(instance.getPrefix() + ":" + getString("name"));
 			((Item) instance).setMaxStackSize(getInt("stacksize"));
 
+			if(instance instanceof ISettingsProcessor)
+			{
+				((ISettingsProcessor)instance).processSettings(this);
+			}
+
 
 		} catch (Exception e) {
 			log.warn("Could not instantiate " + getString("name") + ". Possibly the constructor is malformed?");

src/main/java/com/jeffpeng/jmod/actions/SetBlockProperties.java

@@ -4,6 +4,8 @@
 import java.util.Map;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 
 import com.jeffpeng.jmod.JMODRepresentation;
 import com.jeffpeng.jmod.primitives.BasicAction;
@@ -25,6 +27,7 @@ public SetBlockProperties(JMODRepresentation owner, String blockstring) {
 	private Map<Integer,Integer> harvestlevel = new HashMap<>();
 	private Boolean opaque;
 	private Float lightlevel;
+	private int burnTime;
 
 
 	public SetBlockProperties hardness(Float hardness){
@@ -66,7 +69,11 @@ public SetBlockProperties sound(String sound){
 	public SetBlockProperties opaque(boolean op){
 		this.opaque = op;
 		return this;
-
+	}
+
+	public SetBlockProperties furnaceBurnTime(int burnTime){
+		this.burnTime = 0;
+		return this;
 	}
 
 	public SetBlockProperties blastresistance(float blastresistance){
@@ -112,6 +119,10 @@ public void execute(){
 				{
 					block.setLightLevel(lightlevel);
 				}
+
+				if (burnTime != 0){
+					owner.fuelHandler.setBurnTime(new ItemStack(block), burnTime);
+				}
 
 			} else {
 				log.warn("Cannot patch block properties for " + blockstring + " as it is not in the game. Omitting.");

src/main/java/com/jeffpeng/jmod/crafting/FuelHandler.java

@@ -0,0 +1,50 @@
+package com.jeffpeng.jmod.crafting;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.jeffpeng.jmod.JMODRepresentation;
+import com.jeffpeng.jmod.interfaces.IFurnaceFuel;
+import com.jeffpeng.jmod.interfaces.IItem;
+import com.jeffpeng.jmod.primitives.OwnedObject;
+import com.jeffpeng.jmod.types.blocks.CoreBlock;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import cpw.mods.fml.common.IFuelHandler;
+
+public class FuelHandler implements IFuelHandler {
+	private Map<Integer,Integer> fuelList = new HashMap<>();
+
+	public void setBurnTime(ItemStack is, int burntime){
+		Item item = is.getItem();
+		Block block = Block.getBlockFromItem(item);
+
+		if(block != null && block instanceof IFurnaceFuel){
+			((IFurnaceFuel)block).setBurnTime(burntime);
+			return;
+		}
+
+		Item.getIdFromItem(item);
+
+		fuelList.put(Item.getIdFromItem(item), burntime);
+	}
+
+	@Override
+	public int getBurnTime(ItemStack fuel) {
+
+		Item item = fuel.getItem();
+		Block block = Block.getBlockFromItem(item);
+
+		if(block != null && block instanceof IFurnaceFuel){
+			return ((CoreBlock)block).getBurnTime();
+		}
+
+		if(item instanceof IFurnaceFuel){
+			return ((IItem)item).getBurnTime();
+		} else {
+			return fuelList.get(Item.getIdFromItem(item));
+		}
+	}
+}

src/main/java/com/jeffpeng/jmod/interfaces/IBlock.java

@@ -1,6 +1,6 @@
 package com.jeffpeng.jmod.interfaces;
 
-public interface IBlock extends IOwned{
+public interface IBlock extends IOwned, IFurnaceFuel{
 	public String getName();
 	default public String getPrefix(){
 		return getOwner().getModId();

src/main/java/com/jeffpeng/jmod/interfaces/IFurnaceFuel.java

@@ -0,0 +1,6 @@
+package com.jeffpeng.jmod.interfaces;
+
+public interface IFurnaceFuel {
+	abstract public int getBurnTime();
+	abstract public void setBurnTime(int burntime);	
+}

src/main/java/com/jeffpeng/jmod/interfaces/IItem.java

@@ -3,7 +3,7 @@
 import net.minecraft.item.Item;
 
 
-public interface IItem extends IOwned{
+public interface IItem extends IOwned, ISettingsProcessor, IFurnaceFuel{
 
 
 
@@ -25,5 +25,4 @@ default public void register(){
 	default public void setRecipes(){
 
 	}
-
 }

src/main/java/com/jeffpeng/jmod/interfaces/ISettingsProcessor.java

@@ -1,7 +1,11 @@
 package com.jeffpeng.jmod.interfaces;
 
+import com.jeffpeng.jmod.primitives.BasicAction;
+
 public interface ISettingsProcessor {
 
-	public abstract void processSettings(ISettingsReceiver settings );
+	default public void processSettings(BasicAction settings ){
+	};
+	//public abstract void processSetting(String k, Object v);
 
 }

src/main/java/com/jeffpeng/jmod/primitives/BasicAction.java

@@ -5,17 +5,13 @@
 
 import javax.script.Bindings;
 
-
-
-
 import com.jeffpeng.jmod.JMODRepresentation;
 import com.jeffpeng.jmod.actions.SharedRoutines;
 import com.jeffpeng.jmod.interfaces.IExecutableObject;
-import com.jeffpeng.jmod.interfaces.ISettingsReceiver;
 import com.jeffpeng.jmod.interfaces.IStagedObject;
 import com.jeffpeng.jmod.validator.Validator;
 
-public class BasicAction extends OwnedObject implements IExecutableObject, ISettingsReceiver {
+public class BasicAction extends OwnedObject implements IExecutableObject {
 
 	protected boolean valid = false;
 	protected SharedRoutines routines;
@@ -38,7 +34,6 @@ public void execute() {
 
 	}
 
-	@Override	
 	public BasicAction set(Bindings o){
 		for(String key : o.keySet()) settingObjects.put(key, o.get(key));
 
@@ -126,9 +121,4 @@ public int compareTo(IStagedObject arg0) {
 		// TODO Auto-generated method stub
 		return 0;
 	}
-
-
-
-
-
 }

src/main/java/com/jeffpeng/jmod/scripting/JScript.java

@@ -1,7 +1,6 @@
 package com.jeffpeng.jmod.scripting;
 
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -28,6 +27,7 @@ public class JScript {
 
 	public void evalScript(String script){
 		boolean retry = true;
+		JMOD.LOG.info("###evalScript " + script);
 
 		if(JMOD.isServer()){
 			try {
@@ -117,21 +117,23 @@ public JScript(JMODRepresentation jmod){
 			Class[] args = new Class[1];
 			args[0] = JMODRepresentation.class;
 
+			for(Map.Entry<String, String> entry : extraScriptingObjects.entrySet()){
+				System.out.println("###asodry " + entry.getKey() + " " + entry.getValue());
+			}
+
 			for(Map.Entry<String, String> entry : extraScriptingObjects.entrySet()){
 				try {
-					System.out.println("###aso" + globalScope.getClass());
+					System.out.println("###aso " + globalScope.getClass());
 					System.out.println("###aso " + entry.getKey() + " " + entry.getValue());
 					ModScriptObject	instance = (ModScriptObject) Class.forName(entry.getValue()).getDeclaredConstructor(args).newInstance(jmod);
-
+					System.out.println("###aso did");
 					((Map<String,Object>)globalScope).put(entry.getKey(), instance);
-				} catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | SecurityException
-						| ClassNotFoundException e) {
+					System.out.println("###aso did");
+				} catch (Exception e) {
 					// TODO Auto-generated catch block
+					JMOD.LOG.warn("Failed to produce scripting object "+entry.getKey());
 					e.printStackTrace();
-					continue;
 				}
-
-
 			}