Skip to content

Commit 3f76b1b

Browse files
tenumntenumn
committed
3.4.0
1 parent 51d3591 commit 3f76b1b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+433
-220
lines changed

‎dev/Block/Ore.js

+47-36
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Block.createBlock("oreCopper",[
1111
{name:"Copper Ore",texture:[["copper_ore",0]],inCreative:true}
1212
],"ore");
1313
ToolAPI.registerBlockMaterial(BlockID.oreCopper,"stone",2,true);
14+
ToolLib.addBlockDropOnExplosion("oreCopper");
1415
Block.setDestroyLevel("oreCopper",2);
1516

1617
// 黝铜矿石
@@ -19,6 +20,7 @@ Block.createBlock("oreTetrahedrite",[
1920
{name:"Tetrahedrite Ore",texture:[["tetrahedrite_ore",0]],inCreative:true}
2021
],"ore");
2122
ToolAPI.registerBlockMaterial(BlockID.oreTetrahedrite,"stone",2,true);
23+
ToolLib.addBlockDropOnExplosion("oreTetrahedrite");
2224
Block.setDestroyLevel("oreTetrahedrite",2);
2325

2426
// 锡石矿石
@@ -27,6 +29,7 @@ Block.createBlock("oreCassiterite",[
2729
{name:"Cassiterite Ore",texture:[["cassiterite_ore",0]],inCreative:true}
2830
],"ore");
2931
ToolAPI.registerBlockMaterial(BlockID.oreCassiterite,"stone",2,true);
32+
ToolLib.addBlockDropOnExplosion("oreCassiterite");
3033
Block.setDestroyLevel("oreCassiterite",2);
3134

3235
// 方铅矿石
@@ -43,6 +46,7 @@ Block.createBlock("oreSpodumene",[
4346
{name:"Spodumene Ore",texture:[["spodumene_ore",0]],inCreative:true}
4447
],"ore");
4548
ToolAPI.registerBlockMaterial(BlockID.oreSpodumene,"stone",2,true);
49+
ToolLib.addBlockDropOnExplosion("oreSpodumene");
4650
Block.setDestroyLevel("oreSpodumene",2);
4751

4852
// 石墨矿石
@@ -51,6 +55,7 @@ Block.createBlock("oreGraphite",[
5155
{name:"Graphite Ore",texture:[["graphite_ore",0]],inCreative:true}
5256
],"ore");
5357
ToolAPI.registerBlockMaterial(BlockID.oreGraphite,"stone",2,true);
58+
ToolLib.addBlockDropOnExplosion("oreGraphite");
5459
Block.setDestroyLevel("oreGraphite",2);
5560

5661
Block.registerDropFunction("oreGraphite",function(coords,id,data,level,enchant){
@@ -67,6 +72,7 @@ Block.createBlock("oreTungsten",[
6772
{name:"Tungsten Ore",texture:[["tungsten_ore",0]],inCreative:true}
6873
],"ore");
6974
ToolAPI.registerBlockMaterial(BlockID.oreTungsten,"stone",3,true);
75+
ToolLib.addBlockDropOnExplosion("oreTungsten");
7076
Block.setDestroyLevel("oreTungsten",3);
7177

7278
// 铀矿石
@@ -75,6 +81,7 @@ Block.createBlock("oreUranium",[
7581
{name:"Uranium Ore",texture:[["uranium_ore",0]],inCreative:true}
7682
],"ore");
7783
ToolAPI.registerBlockMaterial(BlockID.oreUranium,"stone",3,true);
84+
ToolLib.addBlockDropOnExplosion("oreUranium");
7885
Block.setDestroyLevel("oreUranium",3);
7986

8087
// 银矿石
@@ -83,6 +90,7 @@ Block.createBlock("oreSilver",[
8390
{name:"Silver Ore",texture:[["silver_ore",0]],inCreative:true}
8491
],"ore");
8592
ToolAPI.registerBlockMaterial(BlockID.oreSilver,"stone",2,true);
93+
ToolLib.addBlockDropOnExplosion("oreSilver");
8694
Block.setDestroyLevel("oreSilver",2);
8795

8896
// 铝土矿石
@@ -91,6 +99,7 @@ Block.createBlock("oreBauxite",[
9199
{name:"Bauxite Ore",texture:[["bauxite_ore",0]],inCreative:true}
92100
],"ore");
93101
ToolAPI.registerBlockMaterial(BlockID.oreBauxite,"stone",2,true);
102+
ToolLib.addBlockDropOnExplosion("oreBauxite");
94103
Block.setDestroyLevel("oreBauxite",2);
95104

96105
// 盐矿石
@@ -99,6 +108,7 @@ Block.createBlock("oreSalt",[
99108
{name:"Salt Ore",texture:[["salt_ore",0]],inCreative:true}
100109
],"ore");
101110
ToolAPI.registerBlockMaterial(BlockID.oreSalt,"stone",1,true);
111+
ToolLib.addBlockDropOnExplosion("oreSalt");
102112
Block.setDestroyLevel("oreSalt",1);
103113

104114
Block.registerDropFunction("oreSalt",function(coords,id,data,level,enchant){
@@ -115,6 +125,7 @@ Block.createBlock("oreRuby",[
115125
{name:"Ruby Ore",texture:[["ruby_ore",0]],inCreative:true}
116126
],"ore");
117127
ToolAPI.registerBlockMaterial(BlockID.oreRuby,"stone",3,true);
128+
ToolLib.addBlockDropOnExplosion("oreRuby");
118129
Block.setDestroyLevel("oreRuby",3);
119130

120131
Block.registerDropFunction("oreRuby",function(coords,id,data,level,enchant){
@@ -160,10 +171,10 @@ var OreVein = {
160171
var ore = [];
161172
for(let i in ores){
162173
var item = ores[i];
163-
for(let n = 0;n < Math.min(item.count,100);n++) ore.push({id:item.id,data:item.data});
174+
for(let n = 0;n < item.count;n++) ore.push({id:item.id,data:item.data});
164175
}
165176

166-
for(let i = 0;i < Math.min(random,100);i++) this.OVERWORLD_VEIN.push({name:name,ore:ore,minHeight:min,maxHeight:max,size:size});
177+
for(let i = 0;i < random;i++) this.OVERWORLD_VEIN.push({name:name,ore:ore,minHeight:min,maxHeight:max,size:size});
167178

168179
if(stone) this.SMALL_STONE[name] = stone;
169180

@@ -174,10 +185,10 @@ var OreVein = {
174185
var ore = [];
175186
for(let i in ores){
176187
var item = ores[i];
177-
for(let n = 0;n < Math.min(item.count,100);n++) ore.push({id:item.id,data:item.data});
188+
for(let n = 0;n < item.count;n++) ore.push({id:item.id,data:item.data});
178189
}
179190

180-
for(let i = 0;i < Math.min(random,100);i++) this.NETHER_VEIN.push({name:name,ore:ore,minHeight:min,maxHeight:max,size:size});
191+
for(let i = 0;i < random;i++) this.NETHER_VEIN.push({name:name,ore:ore,minHeight:min,maxHeight:max,size:size});
181192

182193
if(stone) this.SMALL_STONE[name] = stone;
183194

@@ -188,48 +199,48 @@ var OreVein = {
188199
var ore = [];
189200
for(let i in ores){
190201
var item = ores[i];
191-
for(let n = 0;n < Math.min(item.count,100);n++) ore.push({id:item.id,data:item.data});
202+
for(let n = 0;n < item.count;n++) ore.push({id:item.id,data:item.data});
192203
}
193204

194-
for(let i = 0;i < Math.min(random,100);i++) this.ENDER_VEIN.push({name:name,ore:ore,minHeight:min,maxHeight:max,size:size});
205+
for(let i = 0;i < random;i++) this.ENDER_VEIN.push({name:name,ore:ore,minHeight:min,maxHeight:max,size:size});
195206

196207
if(stone) this.SMALL_STONE[name] = stone;
197208

198209
this.VEIN.ENDER_VEIN.push({name:name,ore:ores,minHeight:min,maxHeight:max,size:size});
199210
}
200211
}
201212

202-
// 煤炭矿脉
203-
OreVein.registerOreVein("Coal",80,[{id:16,count:64,data:0}],48,80,16,{id:ItemID.tinyCoal,count:1,data:0});
204-
205-
// 铝土矿脉
206-
OreVein.registerOreVein("Bauxite",80,[{id:BlockID.oreBauxite,count:64,data:0}],48,96,16,{id:ItemID.oreChunkBauxite,count:1,data:0});
207-
208-
// 黝铜矿脉
209-
OreVein.registerOreVein("Tetrahedrite",150,[{id:BlockID.oreTetrahedrite,count:48,data:0},{id:BlockID.oreCopper,count:24,data:0}],64,128,30,{id:ItemID.oreChunkTetrahedrite,count:1,data:0});
210-
211-
// 钻石矿脉
212-
OreVein.registerOreVein("Diamonds",60,[{id:56,count:6,data:0},{id:16,count:64,data:0},{id:BlockID.oreGraphite,count:48,data:0}],0,16,12,{id:ItemID.dustSmallDiamond,count:1,data:0});
213-
214-
// 沥青铀矿脉
215-
OreVein.registerOreVein("Pitchblende",40,[{id:BlockID.oreUranium,count:12,data:0}],8,32,8,{id:ItemID.oreChunkUranium,count:1,data:0});
216-
217-
// 锡石矿脉
218-
OreVein.registerOreVein("Cassiterite",170,[{id:BlockID.oreCassiterite,count:24,data:0},{id:BlockID.oreTungsten,count:6,data:0}],32,96,35,{id:ItemID.oreChunkUranium,count:1,data:0});
219-
220-
// 铁矿脉
221-
OreVein.registerOreVein("Iron",120,[{id:15,count:48,data:0}],16,32,24,{id:ItemID.oreChunkIron,count:1,data:0});
222-
223-
// 方铅矿脉
224-
OreVein.registerOreVein("Galena",40,[{id:BlockID.oreGalena,count:48,data:0},{id:BlockID.oreSilver,count:12,data:0}],32,64,8,{id:ItemID.oreChunkGalena,count:1,data:0});
225-
226-
// 岩盐矿脉
227-
OreVein.registerOreVein("Salt",30,[{id:BlockID.oreSalt,count:48,data:0},{id:BlockID.oreSpodumene,count:64,data:0}],48,64,8,{id:ItemID.dustSmallSalt,count:1,data:0});
228-
229-
// 红石矿脉
230-
OreVein.registerOreVein("Redstone",60,[{id:73,count:48,data:0},{id:BlockID.oreRuby,count:6,data:0}],16,48,12,{id:ItemID.dustSmallRedstone,count:1,data:0});
231-
232213
Callback.addCallback("PreLoaded",function(){
214+
// 煤炭矿脉
215+
OreVein.registerOreVein("Coal",80,[{id:16,count:64,data:0}],48,80,16,{id:ItemID.tinyCoal,count:1,data:0});
216+
217+
// 铝土矿脉
218+
OreVein.registerOreVein("Bauxite",80,[{id:BlockID.oreBauxite,count:64,data:0}],48,96,16,{id:ItemID.oreChunkBauxite,count:1,data:0});
219+
220+
// 黝铜矿脉
221+
OreVein.registerOreVein("Tetrahedrite",150,[{id:BlockID.oreTetrahedrite,count:48,data:0},{id:BlockID.oreCopper,count:24,data:0}],64,128,30,{id:ItemID.oreChunkTetrahedrite,count:1,data:0});
222+
223+
// 钻石矿脉
224+
OreVein.registerOreVein("Diamonds",60,[{id:56,count:6,data:0},{id:16,count:64,data:0},{id:BlockID.oreGraphite,count:48,data:0}],0,16,12,{id:ItemID.dustSmallDiamond,count:1,data:0});
225+
226+
// 沥青铀矿脉
227+
OreVein.registerOreVein("Pitchblende",40,[{id:BlockID.oreUranium,count:12,data:0}],8,32,8,{id:ItemID.oreChunkUranium,count:1,data:0});
228+
229+
// 锡石矿脉
230+
OreVein.registerOreVein("Cassiterite",170,[{id:BlockID.oreCassiterite,count:24,data:0},{id:BlockID.oreTungsten,count:6,data:0}],32,96,35,{id:ItemID.oreChunkUranium,count:1,data:0});
231+
232+
// 铁矿脉
233+
OreVein.registerOreVein("Iron",120,[{id:15,count:48,data:0}],16,32,24,{id:ItemID.oreChunkIron,count:1,data:0});
234+
235+
// 方铅矿脉
236+
OreVein.registerOreVein("Galena",40,[{id:BlockID.oreGalena,count:48,data:0},{id:BlockID.oreSilver,count:12,data:0}],32,64,8,{id:ItemID.oreChunkGalena,count:1,data:0});
237+
238+
// 岩盐矿脉
239+
OreVein.registerOreVein("Salt",30,[{id:BlockID.oreSalt,count:48,data:0},{id:BlockID.oreSpodumene,count:64,data:0}],48,64,8,{id:ItemID.dustSmallSalt,count:1,data:0});
240+
241+
// 红石矿脉
242+
OreVein.registerOreVein("Redstone",60,[{id:73,count:48,data:0},{id:BlockID.oreRuby,count:6,data:0}],16,48,12,{id:ItemID.dustSmallRedstone,count:1,data:0});
243+
233244
Callback.addCallback("GenerateChunkUnderground",function(chunkX,chunkZ){
234245
var vein = OreVein.OVERWORLD_VEIN[Math.floor(Math.random() * OreVein.OVERWORLD_VEIN.length)];
235246
if(vein){

‎dev/Item/Cell.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ Callback.addCallback("PreLoaded",function(){
120120
Recipe.addCanningMachineRecipe({id:ItemID.uranium238,data:0},{id:ItemID.cellUranium238,count:1,data:0},{id:ItemID.cellEmpty,data:0});
121121
Recipe.addCanningMachineRecipe({id:ItemID.enrichedUraniumDepleted,data:0},{id:BlockID.fuelRodUranium,count:1,data:0},{id:ItemID.cellEmpty,data:0});
122122

123-
Recipe.addFusionReactorRecipe([{id:ItemID.cellHelium3,count:1,data:0},{id:ItemID.cellDeuterium,count:1,data:0}],[{id:ItemID.cellHelium,count:1,data:0}],112);
124-
Recipe.addFusionReactorRecipe([{id:ItemID.cellTritium,count:1,data:0},{id:ItemID.cellDeuterium,count:1,data:0}],[{id:ItemID.cellHelium,count:1,data:0}],224);
125-
Recipe.addFusionReactorRecipe([{id:ItemID.cellHelium3,count:1,data:0},{id:ItemID.cellLithium6 ,count:1,data:0}],[{id:ItemID.cellHelium,count:1,data:0}],336);
123+
Recipe.addFusionReactorRecipe([{id:ItemID.cellHelium3,count:1,data:0},{id:ItemID.cellDeuterium,count:1,data:0}],[{id:ItemID.cellHelium,count:1,data:0}]);
124+
Recipe.addFusionReactorRecipe([{id:ItemID.cellTritium,count:1,data:0},{id:ItemID.cellDeuterium,count:1,data:0}],[{id:ItemID.cellHelium,count:1,data:0}]);
125+
Recipe.addFusionReactorRecipe([{id:ItemID.cellHelium3,count:1,data:0},{id:ItemID.cellLithium6,count:1,data:0}],[{id:ItemID.cellHelium,count:1,data:0}]);
126126

127-
Recipe.addElectrolyzerRecipe({id:ItemID.cellHeavyWater,count:40,data:0},[{id:ItemID.cellDeuterium,count:40,data:0},{id:ItemID.cellTritium,count:1 ,data:0}]);
128-
Recipe.addElectrolyzerRecipe({id:ItemID.cellDeuterium ,count:50,data:0},[{id:ItemID.cellHelium3,count:20,data:0},{id:ItemID.cellTritium,count:20,data:0}]);
127+
Recipe.addElectrolyzerRecipe({id:ItemID.cellHeavyWater,count:40,data:0},[{id:ItemID.cellDeuterium,count:40,data:0},{id:ItemID.cellTritium,count:1,data:0}]);
128+
Recipe.addElectrolyzerRecipe({id:ItemID.cellDeuterium,count:50,data:0},[{id:ItemID.cellHelium3,count:20,data:0},{id:ItemID.cellTritium,count:20,data:0}]);
129129
});

‎dev/Machine/Autoclave.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var GuiAutoclave = new UI.StandartWindow({
2525

2626
drawing:[
2727
{type:"bitmap",x:900,y:325,bitmap:"logo",scale:GUI_SCALE},
28-
{type:"bitmap",x:350,y:50,bitmap:"energyBackground",scale:GUI_SCALE},
28+
{type:"bitmap",x:350,y:50,bitmap:"energy_background",scale:GUI_SCALE},
2929
{type:"bitmap",x:620,y:175 + GUI_SCALE * 2,bitmap:"arrow_background",scale:GUI_SCALE},
3030
{type:"bitmap",x:700 - GUI_SCALE * 4,y:75 - GUI_SCALE * 4,bitmap:"infoSmall",scale:GUI_SCALE}
3131
],
@@ -35,7 +35,7 @@ var GuiAutoclave = new UI.StandartWindow({
3535
"slotOutput":{type:"slot",x:720,y:175,bitmap:"slot_empty",scale:GUI_SCALE,isValid:function(){return false;}},
3636
"scaleArrow":{type:"scale",x:620,y:175 + GUI_SCALE * 2,direction:0,value:0.5,bitmap:"arrow_scale",scale:GUI_SCALE},
3737
"textEnergy":{type:"text",font:GUI_TEXT,x:700,y:75,width:300,height:30,text:Translation.translate("Energy: ") + "0/0Eu"},
38-
"scaleEnergy":{type:"scale",x:350 + GUI_SCALE * 6,y:50 + GUI_SCALE * 6,direction:1,value:0.5,bitmap:"energyScale",scale:GUI_SCALE},
38+
"scaleEnergy":{type:"scale",x:350 + GUI_SCALE * 6,y:50 + GUI_SCALE * 6,direction:1,value:0.5,bitmap:"energy_scale",scale:GUI_SCALE},
3939

4040
"slotUpgrade1":{type:"slot",x:370,y:325,bitmap:"slot_circuit",isValid:Upgrade.isValidUpgrade},
4141
"slotUpgrade2":{type:"slot",x:430,y:325,bitmap:"slot_circuit",isValid:Upgrade.isValidUpgrade},

‎dev/Machine/Distillery.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var GuiDistillery = new UI.StandartWindow({
2121

2222
drawing:[
2323
{type:"bitmap",x:900,y:325,bitmap:"logo",scale:GUI_SCALE},
24-
{type:"bitmap",x:350,y:50,bitmap:"energyBackground",scale:GUI_SCALE},
24+
{type:"bitmap",x:350,y:50,bitmap:"energy_background",scale:GUI_SCALE},
2525
{type:"bitmap",x:600,y:200 + GUI_SCALE * 2,bitmap:"arrow_background",scale:GUI_SCALE},
2626
{type:"bitmap",x:700 - GUI_SCALE * 4,y:75 - GUI_SCALE * 4,bitmap:"infoSmall",scale:GUI_SCALE}
2727
],
@@ -34,7 +34,7 @@ var GuiDistillery = new UI.StandartWindow({
3434
"slotOutput2":{type:"slot",x:720,y:235,bitmap:"slot_empty",scale:GUI_SCALE,isValid:function(){return false;}},
3535
"slotOutput3":{type:"slot",x:780,y:235,bitmap:"slot_empty",scale:GUI_SCALE,isValid:function(){return false;}},
3636
"textEnergy":{type:"text",font:GUI_TEXT,x:700,y:75,width:300,height:30,text:Translation.translate("Energy: ") + "0/0Eu"},
37-
"scaleEnergy":{type:"scale",x:350 + GUI_SCALE * 6,y:50 + GUI_SCALE * 6,direction:1,value:0.5,bitmap:"energyScale",scale:GUI_SCALE},
37+
"scaleEnergy":{type:"scale",x:350 + GUI_SCALE * 6,y:50 + GUI_SCALE * 6,direction:1,value:0.5,bitmap:"energy_scale",scale:GUI_SCALE},
3838

3939
"slotUpgrade1":{type:"slot",x:370,y:325,bitmap:"slot_circuit",isValid:Upgrade.isValidUpgrade},
4040
"slotUpgrade2":{type:"slot",x:430,y:325,bitmap:"slot_circuit",isValid:Upgrade.isValidUpgrade},

‎dev/Machine/Electrolyzer.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var GuiElectrolyzer = new UI.StandartWindow({
2121

2222
drawing:[
2323
{type:"bitmap",x:900,y:325,bitmap:"logo",scale:GUI_SCALE},
24-
{type:"bitmap",x:350,y:50,bitmap:"energyBackground",scale:GUI_SCALE},
24+
{type:"bitmap",x:350,y:50,bitmap:"energy_background",scale:GUI_SCALE},
2525
{type:"bitmap",x:600,y:200 + GUI_SCALE,bitmap:"arrow_background",scale:GUI_SCALE},
2626
{type:"bitmap",x:700 - GUI_SCALE * 4,y:75 - GUI_SCALE * 4,bitmap:"infoSmall",scale:GUI_SCALE}
2727
],
@@ -34,7 +34,7 @@ var GuiElectrolyzer = new UI.StandartWindow({
3434
"slotOutput2":{type:"slot",x:720,y:210,bitmap:"slot_empty",scale:GUI_SCALE,isValid:function(){return false;}},
3535
"slotOutput3":{type:"slot",x:780,y:210,bitmap:"slot_empty",scale:GUI_SCALE,isValid:function(){return false;}},
3636
"textEnergy":{type:"text",font:GUI_TEXT,x:700,y:75,width:300,height:30,text:Translation.translate("Energy: ") + "0/0Eu"},
37-
"scaleEnergy":{type:"scale",x:350 + GUI_SCALE * 6,y:50 + GUI_SCALE * 6,direction:1,value:0.5,bitmap:"energyScale",scale:GUI_SCALE},
37+
"scaleEnergy":{type:"scale",x:350 + GUI_SCALE * 6,y:50 + GUI_SCALE * 6,direction:1,value:0.5,bitmap:"energy_scale",scale:GUI_SCALE},
3838

3939
"slotUpgrade1":{type:"slot",x:370,y:325,bitmap:"slot_circuit",isValid:Upgrade.isValidUpgrade},
4040
"slotUpgrade2":{type:"slot",x:430,y:325,bitmap:"slot_circuit",isValid:Upgrade.isValidUpgrade},

‎dev/Machine/Wiremill.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var GuiWiremill = new UI.StandartWindow({
2121

2222
drawing:[
2323
{type:"bitmap",x:900,y:325,bitmap:"logo",scale:GUI_SCALE},
24-
{type:"bitmap",x:350,y:50,bitmap:"energyBackground",scale:GUI_SCALE},
24+
{type:"bitmap",x:350,y:50,bitmap:"energy_background",scale:GUI_SCALE},
2525
{type:"bitmap",x:600,y:175 + GUI_SCALE * 2,bitmap:"arrow_background",scale:GUI_SCALE},
2626
{type:"bitmap",x:700 - GUI_SCALE * 4,y:75 - GUI_SCALE * 4,bitmap:"infoSmall",scale:GUI_SCALE}
2727
],
@@ -31,7 +31,7 @@ var GuiWiremill = new UI.StandartWindow({
3131
"slotOutput":{type:"slot",x:720,y:175,bitmap:"slot_empty",scale:GUI_SCALE,isValid:function(){return false;}},
3232
"scaleArrow":{type:"scale",x:600,y:175 + GUI_SCALE * 2,direction:0,value:0.5,bitmap:"arrow_scale",scale:GUI_SCALE},
3333
"textEnergy":{type:"text",font:GUI_TEXT,x:700,y:75,width:300,height:30,text:Translation.translate("Energy: ") + "0/0Eu"},
34-
"scaleEnergy":{type:"scale",x:350 + GUI_SCALE * 6,y:50 + GUI_SCALE * 6,direction:1,value:0.5,bitmap:"energyScale",scale:GUI_SCALE},
34+
"scaleEnergy":{type:"scale",x:350 + GUI_SCALE * 6,y:50 + GUI_SCALE * 6,direction:1,value:0.5,bitmap:"energy_scale",scale:GUI_SCALE},
3535

3636
"slotUpgrade1":{type:"slot",x:370,y:325,bitmap:"slot_circuit",isValid:Upgrade.isValidUpgrade},
3737
"slotUpgrade2":{type:"slot",x:430,y:325,bitmap:"slot_circuit",isValid:Upgrade.isValidUpgrade},

‎dev/block/item_pipe/input_item_pipe.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ TileRenderer.setupWireModel(BlockID.itemPipeInput,1,0.5,"input-item-pipe",true);
1414
Block.setBlockShape(BlockID.itemPipeInput,{x:0.25,y:0.25,z:0},{x:0.75,y:0.75,z:1},0);
1515

1616
Callback.addCallback("PreLoaded",function(){
17-
Recipes.addShapeless({id:BlockID.itemPipeInput,count:1,data:0},[{id:BlockID.itemPipeTransport,data:0},{id:54,data:0}]);
17+
Recipe.addAssemblyTableRecipe([{id:BlockID.itemPipeTransport,data:0},{id:54,data:0}],{id:BlockID.itemPipeInput,count:1,data:0});
1818
});
1919

2020
Machine.registerPrototype(BlockID.itemPipeInput,{

‎dev/block/item_pipe/output_item_pipe.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Renderer.registerPipeOutputRenderModel(BlockID.itemPipeOutput,1,[["input_item_pi
6060
]);
6161

6262
Callback.addCallback("PreLoaded",function(){
63-
Recipes.addShapeless({id:BlockID.itemPipeOutput,count:1,data:0},[{id:BlockID.itemPipeTransport,data:0},{id:410,data:0}]);
63+
Recipe.addAssemblyTableRecipe([{id:BlockID.itemPipeTransport,data:0},{id:410,data:0}],{id:BlockID.itemPipeOutput,count:1,data:0});
6464
});
6565

6666
Machine.registerPrototype(BlockID.itemPipeOutput,{

‎dev/block/module/copper_coil.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Machine.registerPrototype(BlockID.coilCopper,{
4040
if(this.data.durability > 0){
4141
var extra = new ItemExtraData();
4242
extra.putInt("durability",this.data.durability);
43-
World.drop(this.x + 0.5,this.y,this.z + 0.5,0,this.id,1,0,extra);
43+
World.dropItem(this.x + 0.5,this.y,this.z + 0.5,0,this.id,1,0,extra);
4444
} else {
4545
World.drop(this.x + 0.5,this.y + 1,this.z + 0.5,0,ItemID.cellEmpty,1,0);
4646
}

‎dev/block/module/fuel_rod_uranium_refined.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,11 @@ Machine.registerPrototype(BlockID.fuelRodUraniumRefined,{
8282
});
8383

8484
NuclearReactor.registerModule(BlockID.fuelRodUraniumRefined,function(coords,data){
85-
let heat = 6,fuel = 2;
85+
let heat = 9,fuel = 3;
8686
for(let side = 0;side < 6;side++){
8787
var relative = World.getRelativeCoords(coords.x,coords.y,coords.z,side);
8888
var id = World.getBlockID(relative.x,relative.y,relative.z);
89-
if(NuclearReactor.getModuleType(id) == "FuelRod"){
90-
heat += 6,fuel += 2;
91-
}
89+
if(NuclearReactor.getModuleType(id) == "FuelRod") heat += 9,fuel += 3;
9290
}
9391
data.heat += heat,data.fuel += fuel;
9492
},"FuelRod");

‎dev/block/module/gold_coil.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Machine.registerPrototype(BlockID.coilGold,{
4040
if(this.data.durability > 0){
4141
var extra = new ItemExtraData();
4242
extra.putInt("durability",this.data.durability);
43-
World.drop(this.x + 0.5,this.y,this.z + 0.5,0,this.id,1,0,extra);
43+
World.dropItem(this.x + 0.5,this.y,this.z + 0.5,0,this.id,1,0,extra);
4444
} else {
4545
World.drop(this.x + 0.5,this.y + 1,this.z + 0.5,0,ItemID.cellEmpty,1,0);
4646
}

‎dev/block/module/steel_coil.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Machine.registerPrototype(BlockID.coilSteel,{
4040
if(this.data.durability > 0){
4141
var extra = new ItemExtraData();
4242
extra.putInt("durability",this.data.durability);
43-
World.drop(this.x + 0.5,this.y,this.z + 0.5,0,this.id,1,0,extra);
43+
World.dropItem(this.x + 0.5,this.y,this.z + 0.5,0,this.id,1,0,extra);
4444
} else {
4545
World.drop(this.x + 0.5,this.y + 1,this.z + 0.5,0,ItemID.cellEmpty,1,0);
4646
}

0 commit comments

Comments
 (0)