Mod load fixes
This commit is contained in:
@@ -46,6 +46,3 @@ function extend(/*Base, ..., def*/){
|
|||||||
}
|
}
|
||||||
return instance
|
return instance
|
||||||
}
|
}
|
||||||
|
|
||||||
//For backwards compatibility, use extend instead
|
|
||||||
const extendContent = extend;
|
|
||||||
|
|||||||
@@ -49,9 +49,6 @@ function extend(/*Base, ..., def*/){
|
|||||||
return instance
|
return instance
|
||||||
}
|
}
|
||||||
|
|
||||||
//For backwards compatibility, use extend instead
|
|
||||||
const extendContent = extend;
|
|
||||||
|
|
||||||
importPackage(Packages.arc)
|
importPackage(Packages.arc)
|
||||||
importPackage(Packages.arc.audio)
|
importPackage(Packages.arc.audio)
|
||||||
importPackage(Packages.arc.func)
|
importPackage(Packages.arc.func)
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ public class ContentParser{
|
|||||||
}
|
}
|
||||||
var bc = resolve(data.getString("type", ""), DrawDefault.class);
|
var bc = resolve(data.getString("type", ""), DrawDefault.class);
|
||||||
data.remove("type");
|
data.remove("type");
|
||||||
var result = make(bc);
|
DrawBlock result = make(bc);
|
||||||
readFields(result, data);
|
readFields(result, data);
|
||||||
return result;
|
return result;
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -313,7 +313,7 @@ public class Block extends UnlockableContent implements Senseable{
|
|||||||
/** Configuration handlers by type. */
|
/** Configuration handlers by type. */
|
||||||
public ObjectMap<Class<?>, Cons2> configurations = new ObjectMap<>();
|
public ObjectMap<Class<?>, Cons2> configurations = new ObjectMap<>();
|
||||||
/** Consumption filters. */
|
/** Consumption filters. */
|
||||||
public boolean[] itemFilter, liquidFilter;
|
public boolean[] itemFilter = {}, liquidFilter = {};
|
||||||
/** Array of consumers used by this block. Only populated after init(). */
|
/** Array of consumers used by this block. Only populated after init(). */
|
||||||
public Consume[] consumers = {}, optionalConsumers = {}, nonOptionalConsumers = {}, updateConsumers = {};
|
public Consume[] consumers = {}, optionalConsumers = {}, nonOptionalConsumers = {}, updateConsumers = {};
|
||||||
/** Set to true if this block has any consumers in its array. */
|
/** Set to true if this block has any consumers in its array. */
|
||||||
|
|||||||
@@ -8,4 +8,8 @@ public class ConsumeCoolant extends ConsumeLiquidFilter{
|
|||||||
this.filter = liquid -> liquid.coolant && liquid.temperature <= maxTemp && liquid.flammability < maxFlammability;
|
this.filter = liquid -> liquid.coolant && liquid.temperature <= maxTemp && liquid.flammability < maxFlammability;
|
||||||
this.amount = amount;
|
this.amount = amount;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ConsumeCoolant(){
|
||||||
|
this(1f);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user