Skip to content

Commit 0a4db34

Browse files
committed
Last version for 1.5.2
Fixed: ItemStack bug in Instrial Furnace Recipe problems(Advanced Machine Block and Overclock Upgrade) en_US localize file
1 parent 0098b31 commit 0a4db34

File tree

7 files changed

+35
-24
lines changed

7 files changed

+35
-24
lines changed

FrogCraft/Machines/IndustrialDevices/TileEntityIndustrialDevice.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void updateEntity()
9393
heat=heat+1;
9494
}
9595

96-
if (tick==100){
96+
if (tick==150){
9797
tick=0;
9898

9999
if (heat>0)heat=heat-1;
@@ -116,7 +116,7 @@ public void updateEntity()
116116

117117

118118

119-
if (cansmeltg()&energy>=300){
119+
if (cansmeltg()&energy>=600){
120120
progress+=1;
121121
if (progress==15){
122122
progress=0;
@@ -130,37 +130,39 @@ public void updateEntity()
130130

131131
void dowork(){
132132
for (int i=0;i<6;i++){
133+
if(inv[i]!=null&&inv[i].stackSize<=0)
134+
inv[i]=null;
133135
ItemStack[] results=getResult(inv[i]);
134136
ItemStack result=results[1];
135137
if (result!=null){ //Can smelt
136138
if (inv[i+6]==null){
137139
inv[i+6]=result.copy();
138140

139-
inv[i]=results[0].copy();
140-
if(inv[i].stackSize==0)
141+
inv[i]=results[0];
142+
if(inv[i].stackSize<=0)
141143
inv[i]=null;
142144

143-
energy-=50;
145+
energy-=100;
144146
}
145147

146148
else if (inv[i+6].getItem()==result.getItem()&inv[i+6].getItemDamage()==result.getItemDamage()){
147149
if (inv[i+6].stackSize<=inv[i+6].getMaxStackSize()-result.stackSize){
148150
inv[i+6].stackSize+=result.stackSize;
149151

150152

151-
inv[i]=results[0].copy();
152-
if(inv[i].stackSize==0)
153+
inv[i]=results[0];
154+
if(inv[i].stackSize<=0)
153155
inv[i]=null;
154156

155-
energy-=50;
157+
energy-=100;
156158
}
157159
}
158160
}
159161
}
160162
}
161163

162164
public boolean canwork(){
163-
if (energy<300)
165+
if (energy<600)
164166
return false;
165167

166168
if (redPowerd())

FrogCraft/Machines/IndustrialDevices/TileEntityIndustrialFurnance.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ public ItemStack[] getResult(ItemStack i) {
1010
if (i==null)
1111
return new ItemStack[]{i,null};
1212
ItemStack r= FurnaceRecipes.smelting().getSmeltingResult(i.copy());
13-
i.stackSize-=1;
13+
if(r!=null)
14+
i.stackSize-=1;
1415
return new ItemStack[]{i,r};
1516
}
1617

FrogCraft/Machines/TileEntityAdvanceChemicalReactor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public void closeChest() {}
276276

277277

278278
@Override
279-
public boolean isStackValidForSlot(int i, ItemStack itemstack) {return false;}
279+
public boolean isStackValidForSlot(int i, ItemStack itemstack) {return true;}
280280

281281
//SidedInventory
282282
@Override

FrogCraft/Machines2/ACWindMill/TileEntityACWindMillBase.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import FrogCraft.Common.SidedIC2Machine;
44
import ic2.api.Direction;
5+
import ic2.api.energy.event.EnergyTileLoadEvent;
56
import ic2.api.energy.event.EnergyTileSourceEvent;
67
import net.minecraft.tileentity.TileEntity;
78
import net.minecraftforge.common.MinecraftForge;
@@ -10,7 +11,7 @@ public class TileEntityACWindMillBase extends SidedIC2Machine implements ic2.api
1011
private EnergyTileSourceEvent sourceEvent;
1112
public int energy=0;
1213
public int maxEnergy=256;
13-
14+
public boolean addedToEnergyNet;
1415

1516
@Override
1617
public void updateEntity(){
@@ -19,6 +20,13 @@ public void updateEntity(){
1920
if (worldObj.isRemote)
2021
return;
2122

23+
if (!this.addedToEnergyNet)
24+
{
25+
//EnergyNet.getForWorld(this.worldObj).addTileEntity(this);
26+
MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this));
27+
this.addedToEnergyNet = true;
28+
}
29+
2230
out(32);
2331
out(32);
2432
}
@@ -39,7 +47,7 @@ public boolean emitsEnergyTo(TileEntity receiver, Direction direction) {
3947

4048
@Override
4149
public boolean isAddedToEnergyNet() {
42-
return true;
50+
return addedToEnergyNet;
4351
}
4452

4553
@Override

FrogCraft/Machines2/ACWindMill/TileEntityACWindMillTop.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void updateEntity(){
3131

3232
if(settled){
3333
TileEntityACWindMillBase te=findBase();
34-
int gen=37;
34+
int gen=13;
3535
for (int x=-3;x<4;x++){
3636
for (int y=-3;y<4;y++){
3737
for (int z=-3;z<4;z++){

FrogCraft/OreDictRegister.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
public class OreDictRegister {
1111
public static void registerOreDict(){
1212
//IC2
13-
OreDictionary.registerOre("crafting1kkEUStore",Items.getItem("lapotronCrystal"));
14-
OreDictionary.registerOre("craftingRawMachineTier01",Items.getItem("machine"));
15-
OreDictionary.registerOre("craftingRawMachineTier02",Items.getItem("advancedMachine"));
16-
OreDictionary.registerOre("craftingCompressor",Items.getItem("compressor"));
17-
OreDictionary.registerOre("craftingMacerator",Items.getItem("macerator"));
18-
OreDictionary.registerOre("craftingExtractor",Items.getItem("extractor"));
19-
OreDictionary.registerOre("craftingPump",Items.getItem("pump"));
13+
OreDictionary.registerOre("crafting1kkEUStore",Items.getItem("lapotronCrystal").copy());
14+
OreDictionary.registerOre("craftingRawMachineTier01",Items.getItem("machine").copy());
15+
OreDictionary.registerOre("craftingRawMachineTier02",Items.getItem("advancedMachine").copy());
16+
OreDictionary.registerOre("craftingCompressor",Items.getItem("compressor").copy());
17+
OreDictionary.registerOre("craftingMacerator",Items.getItem("macerator").copy());
18+
OreDictionary.registerOre("craftingExtractor",Items.getItem("extractor").copy());
19+
OreDictionary.registerOre("craftingPump",Items.getItem("pump").copy());
2020

2121
//FC
2222
OreDictionary.registerOre("crafting60kCoolantStore",fcItems.IC2Coolant_NH3_60K);

FrogCraft/RecipeRegister.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ static void loadGTMachineRecipes(){
245245
GregTech_API.addGrinderRecipe(new ItemStack(fcItems.oreID,1,1), -1, fcItems.getItem(cls.dust, "Fluorapatite", 8), GregTech_API.getGregTechItem(4, 1, 36), null, null);
246246

247247
//Assembler---------------------------------------------------------------
248-
GregTech_API.addAssemblerRecipe(GregTech_API.getGregTechItem(0, 8, 13), null, Items.getItem("advancedMachine").splitStack(2), 500, 1);
248+
GregTech_API.addAssemblerRecipe(GregTech_API.getGregTechItem(0, 8, 13), null, Items.getItem("advancedMachine").copy().splitStack(2), 500, 1);
249249
}
250250

251251
static void loadICMachineRecipes(){
@@ -254,15 +254,15 @@ static void loadICMachineRecipes(){
254254
//Super Conductor
255255
ic2.api.recipe.Recipes.advRecipes.addRecipe(GregTech_API.getGregTechItem(3, 4, 2), new Object[]{"lll","wiw","fff",'l',new ItemStack(fcItems.IC2Coolant_NH3_60K),'w',GregTech_API.getGregTechItem(0, 1, 80),'i',Items.getItem("iridiumPlate"),'f',GregTech_API.getGregTechItem(3, 1, 0)});
256256
//AdvanceMachine
257-
ic2.api.recipe.Recipes.advRecipes.addRecipe(Items.getItem("advancedMachine"), new Object[]{"xxx","x x","xxx",'x',GregTech_API.getGregTechItem(0, 1, 13)});
257+
ic2.api.recipe.Recipes.advRecipes.addRecipe(Items.getItem("advancedMachine").copy(), new Object[]{"xxx","x x","xxx",'x',GregTech_API.getGregTechItem(0, 1, 13)});
258258
}
259259

260260
//IC Items
261261
//fertilizer
262262
regIC2UnShapedRecipe(Items.getItem("fertilizer").splitStack(16),new Object[]{fcItems.getItem(cls.dust, "Urea"),Items.getItem("fertilizer")});
263263
regIC2UnShapedRecipe(Items.getItem("fertilizer").splitStack(64),new Object[]{fcItems.getItem(cls.misc, "GoldClod"),Items.getItem("fertilizer")});
264264
//overclockerUpgrade
265-
ic2.api.recipe.Recipes.advRecipes.addRecipe(Items.getItem("overclockerUpgrade").splitStack(2),new Object[]{" o ","lal"," ",'a',Items.getItem("electronicCircuit"),'l',Items.getItem("insulatedCopperCableItem"),'o',fcItems.IC2Coolant_NH3_60K});
265+
ic2.api.recipe.Recipes.advRecipes.addRecipe(Items.getItem("overclockerUpgrade").copy().splitStack(2),new Object[]{" o ","lal"," ",'a',Items.getItem("electronicCircuit"),'l',Items.getItem("insulatedCopperCableItem"),'o',fcItems.IC2Coolant_NH3_60K});
266266

267267
//IC2 Compressor Recipes
268268
ic2.api.recipe.Recipes.compressor.addRecipe(new ItemStack(fcItems.miscsID,8,0), new ItemStack(fcItems.miscsID,1,1));

0 commit comments

Comments
 (0)