Skip to content

Commit

Permalink
Merge pull request #870 from BluSunrize/0.7
Browse files Browse the repository at this point in the history
Release 0.7
  • Loading branch information
BluSunrize committed Jan 13, 2016
2 parents 5a2594c + bc4b232 commit 113c5d6
Show file tree
Hide file tree
Showing 88 changed files with 4,345 additions and 346 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildscript {

apply plugin: 'forge'

version = "0.6.5.1"
version = "0.7.0"
group= "blusunrize"
archivesBaseName = "ImmersiveEngineering"

Expand Down
18 changes: 18 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
#####Version 0.7.0 - BUILT
- rebalanced the entirety of everything!
- Metal Plates:
- added metal plates. They are made with the Engineer's Hammer or the Metal Press
- the hammer takes damage
- they are used in multiple recipes
- Blast Furnaces:
- nerfed the old Blast Furnace. It is called "Crude Blast Furnace" now and can NOT be automated
- added the "Improved Blast Furnace". It can accept preheaters to increase its speed and is automateable
- both Blast Furnaces create Slag
- changed the recipe for the Arc Furnace. It uses less steel and reuses the blastbricks of the Improved Blast Furnace
- the amount of blastbricks stays consistent throughout the recipes, with the intent of the player UPGRADING the Furnaces
- added the Engineer's Toolbox, a convenient way to carry IE tools, wires and other items
- general fixes to lots of stuff

==============
##### 0.6 VERSIONS ######
==============
#####Version 0.6.5.1 - BUILT
- hotfix!
- fixed Server crashes with the Botania compat!
Expand Down
3 changes: 2 additions & 1 deletion contributorRevolvers.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@
"5637d6e4-1211-45a7-ba06-719685b8c28a",
"6712dff7-a5d3-4a55-9c25-33b50e173ee1",
"2025b40c-ac8a-4f03-a4df-a546b618afb2",
"40766944-d2a8-49c5-8623-fed8da1e526d"
"40766944-d2a8-49c5-8623-fed8da1e526d",
"d4f46d8e-eee2-48ef-aa91-1b32fd19cd9c"
],
"tag":"patreonBlu_0","flavour":"","baseUpgrades":{},"renderAdditions":["bayonet_attachment"]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class ImmersiveEngineering
public static final String MODID = "ImmersiveEngineering";
public static final String MODNAME = "Immersive Engineering";
public static final String VERSION = "${version}";
public static final double VERSION_D = .65;
public static final double VERSION_D = .7;

@Mod.Instance(MODID)
public static ImmersiveEngineering instance = new ImmersiveEngineering();
Expand Down Expand Up @@ -89,7 +89,7 @@ public void preInit(FMLPreInitializationEvent event)
IEApi.prefixToIngotMap.put("plate", new Integer[]{1,1});
IEApi.prefixToIngotMap.put("gear", new Integer[]{4,1});
IEApi.prefixToIngotMap.put("rod", new Integer[]{2,1});
IEApi.prefixToIngotMap.put("fence", new Integer[]{6,16});
IEApi.prefixToIngotMap.put("fence", new Integer[]{3,2});
IECompatModule.doModulesPreInit();
}
@Mod.EventHandler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,21 @@ public class BlastFurnaceRecipe
{
public final Object input;
public final ItemStack output;
public final ItemStack slag;
public final int time;

public BlastFurnaceRecipe(ItemStack output, Object input, int time)
public BlastFurnaceRecipe(ItemStack output, Object input, int time, ItemStack slag)
{
this.output=output;
this.input=ApiUtils.convertToValidRecipeInput(input);
this.time=time;
this.slag=slag;
}

public static ArrayList<BlastFurnaceRecipe> recipeList = new ArrayList<BlastFurnaceRecipe>();
public static void addRecipe(ItemStack output, Object input, int time)
public static void addRecipe(ItemStack output, Object input, int time, ItemStack slag)
{
BlastFurnaceRecipe recipe = new BlastFurnaceRecipe(output, input, time);
BlastFurnaceRecipe recipe = new BlastFurnaceRecipe(output, input, time, slag);
if(recipe.input!=null)
recipeList.add(recipe);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
package blusunrize.immersiveengineering.api.crafting;

import java.util.List;

import com.google.common.collect.ArrayListMultimap;

import blusunrize.immersiveengineering.api.ApiUtils;
import blusunrize.immersiveengineering.api.ComparableItemStack;
import net.minecraft.item.ItemStack;

/**
* @author BluSunrize - 07.01.2016
*
* The recipe for the extruder
*/
public class MetalPressRecipe
{
public final Object input;
public final ComparableItemStack mold;
public final ItemStack output;
public final int energy;
public int inputSize;

public MetalPressRecipe(ItemStack output, Object input, ItemStack mould, int energy)
{
this.output = output;
this.input = ApiUtils.convertToValidRecipeInput(input);
this.mold = ApiUtils.createComparableItemStack(mould);
this.energy = energy;
inputSize = this.input instanceof ItemStack?((ItemStack)this.input).stackSize:1;
}
public MetalPressRecipe setInputSize(int size)
{
this.inputSize = size;
if(this.input instanceof ItemStack)
((ItemStack)this.input).stackSize = size;
return this;
}


public static ArrayListMultimap<ComparableItemStack, MetalPressRecipe> recipeList = ArrayListMultimap.create();
public static MetalPressRecipe addRecipe(ItemStack output, Object input, ItemStack mold, int energy)
{
MetalPressRecipe r = new MetalPressRecipe(output, input, mold, energy);
recipeList.put(r.mold, r);
return r;
}
public static MetalPressRecipe findRecipe(ItemStack mould, ItemStack input)
{
if(mould==null || input==null)
return null;
ComparableItemStack comp = ApiUtils.createComparableItemStack(mould);
List<MetalPressRecipe> list = recipeList.get(comp);
for(MetalPressRecipe recipe : list)
if(ApiUtils.stackMatchesObject(input, recipe.input) && (input.stackSize>=recipe.inputSize))
return recipe;
return null;
}
// public static List<ExtruderRecipe> removeRecipes(ItemStack stack)
// {
// List<ExtruderRecipe> list = new ArrayList();
// Iterator<ExtruderRecipe> it = recipeList.iterator();
// while(it.hasNext())
// {
// ExtruderRecipe ir = it.next();
// if(OreDictionary.itemMatches(ir.output, stack, true))
// {
// list.add(ir);
// it.remove();
// }
// }
// return list;
// }

public static boolean isValidMold(ItemStack itemStack)
{
if(itemStack==null)
return false;
return recipeList.containsKey(ApiUtils.createComparableItemStack(itemStack));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ void rebindUVsToIcon(WavefrontObject model, ModelIEObj modelIE)
for(GroupObject groupObject : model.groupObjects)
{
IIcon icon = modelIE.getBlockIcon(groupObject.name);
if(icon==null)
continue;
float minU = icon.getInterpolatedU(0);
float sizeU = icon.getInterpolatedU(16) - minU;
float minV = icon.getInterpolatedV(0);
Expand Down Expand Up @@ -556,7 +558,6 @@ else if((equipped.getItem() instanceof ItemDrill && equipped.getItemDamage()==0)
// int duration = player.getItemInUseDuration();
// int chargeTime = ((ItemRailgun)equipped.getItem()).getChargeTime(equipped);
// int chargeLevel = Math.min(99, (int)(duration/(float)chargeTime*100));
// // System.out.println("");
// // ClientUtils.drawTexturedRect(0,0, 64,32, 0/256f,64/256f, 96/256f,128/256f);
//
// GL11.glScalef(1.5f,1.5f,1.5f);
Expand Down Expand Up @@ -868,12 +869,12 @@ public void onRenderLivingPre(RenderLivingEvent.Pre event)
else if(model instanceof ModelVillager)
((ModelVillager)model).villagerHead.showModel=false;
}
// if(OreDictionary.itemMatches(new ItemStack(IEContent.itemRailgun),event.entity.getEquipmentInSlot(0),true))
// {
// ModelBase model = event.renderer.mainModel;
// if(model instanceof ModelBiped)
// ((ModelBiped)model).bipedLeftArm.rotateAngleX=.9f;
// }
// if(OreDictionary.itemMatches(new ItemStack(IEContent.itemRailgun),event.entity.getEquipmentInSlot(0),true))
// {
// ModelBase model = event.renderer.mainModel;
// if(model instanceof ModelBiped)
// ((ModelBiped)model).bipedLeftArm.rotateAngleX=.9f;
// }
}
@SubscribeEvent()
public void onRenderLivingPost(RenderLivingEvent.Post event)
Expand Down
Loading

0 comments on commit 113c5d6

Please sign in to comment.