Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handled compiler errors by either resolving them or commenting & adding a TODO

Browse Source
This commit is contained in:
Timmeey86
2018-11-20 22:33:36 +01:00
parent c1bb05c0a4
commit f561768c67
30 changed files with 174 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
+12 -16
View File
@@ -38,7 +38,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
fluxNeeded = 2;
consumes.items(new ItemStack[]{new ItemStack(Items.copper, 1), new ItemStack(Items.lead, 2)});
consumes.power(0.1f);
basePowerUse = 0.1f;
}};
siliconsmelter = new PowerSmelter("silicon-smelter"){{
@@ -46,13 +46,12 @@ public class CraftingBlocks extends BlockList implements ContentList{
craftEffect = BlockFx.smeltsmoke;
result = Items.silicon;
craftTime = 40f;
powerCapacity = 20f;
size = 2;
hasLiquids = false;
flameColor = Color.valueOf("ffef99");
consumes.items(new ItemStack[]{new ItemStack(Items.coal, 1), new ItemStack(Items.sand, 2)});
consumes.power(0.05f);
basePowerUse = 0.05f;
}};
plastaniumCompressor = new PlastaniumCompressor("plastanium-compressor"){{
@@ -61,7 +60,6 @@ public class CraftingBlocks extends BlockList implements ContentList{
craftTime = 60f;
output = Items.plastanium;
itemCapacity = 30;
powerCapacity = 40f;
size = 2;
health = 320;
hasPower = hasLiquids = true;
@@ -69,7 +67,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
updateEffect = BlockFx.plasticburn;
consumes.liquid(Liquids.oil, 0.25f);
consumes.power(0.3f);
basePowerUse = 0.3f;
consumes.item(Items.titanium, 2);
}};
@@ -77,24 +75,22 @@ public class CraftingBlocks extends BlockList implements ContentList{
craftEffect = BlockFx.smeltsmoke;
result = Items.phasefabric;
craftTime = 120f;
powerCapacity = 50f;
size = 2;
consumes.items(new ItemStack[]{new ItemStack(Items.thorium, 4), new ItemStack(Items.sand, 10)});
consumes.power(0.5f);
basePowerUse = 0.5f;
}};
alloySmelter = new PowerSmelter("alloy-smelter"){{
craftEffect = BlockFx.smeltsmoke;
result = Items.surgealloy;
craftTime = 75f;
powerCapacity = 60f;
size = 2;
useFlux = true;
fluxNeeded = 3;
consumes.power(0.4f);
basePowerUse = 0.4f;
consumes.items(new ItemStack[]{new ItemStack(Items.titanium, 2), new ItemStack(Items.lead, 4), new ItemStack(Items.silicon, 3), new ItemStack(Items.copper, 3)});
}};
@@ -105,7 +101,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
size = 2;
hasPower = true;
consumes.power(0.1f);
basePowerUse = 0.1f;
consumes.item(Items.titanium);
consumes.liquid(Liquids.water, 0.3f);
}};
@@ -120,7 +116,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
consumes.liquid(Liquids.oil, 0.05f);
consumes.item(Items.pyratite, 1);
consumes.power(0.04f);
basePowerUse = 0.04f;
}};
pyratiteMixer = new PowerSmelter("pyratite-mixer"){{
@@ -132,7 +128,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
size = 2;
consumes.power(0.02f);
basePowerUse = 0.02f;
consumes.items(new ItemStack[]{new ItemStack(Items.coal, 1), new ItemStack(Items.lead, 2), new ItemStack(Items.sand, 2)});
}};
@@ -144,7 +140,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
craftTime = 10f;
hasLiquids = hasPower = true;
consumes.power(0.1f);
basePowerUse = 0.1f;
consumes.item(Items.stone, 2);
}};
@@ -189,7 +185,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
size = 2;
consumes.item(Items.stone, 2);
consumes.power(0.2f);
basePowerUse = 0.2f;
consumes.liquid(Liquids.water, 0.5f);
}};
@@ -204,7 +200,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
hasLiquids = true;
consumes.item(Items.biomatter, 1);
consumes.power(0.06f);
basePowerUse = 0.06f;
}};
pulverizer = new Pulverizer("pulverizer"){{
@@ -217,7 +213,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
hasItems = hasPower = true;
consumes.item(Items.stone, 1);
consumes.power(0.05f);
basePowerUse = 0.05f;
}};
solidifier = new GenericCrafter("solidifer"){{
core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java
+7 -6
View File
@@ -40,7 +40,8 @@ public class DebugBlocks extends BlockList implements ContentList{
public void load(){
powerVoid = new PowerBlock("powervoid"){
{
powerCapacity = Float.MAX_VALUE;
// TODO Adapt to new power system if necessary
basePowerUse = Float.MAX_VALUE;
shadow = "shadow-round-1";
}
@@ -53,23 +54,23 @@ public class DebugBlocks extends BlockList implements ContentList{
@Override
public void init(){
super.init();
stats.remove(BlockStat.powerCapacity);
// TODO Adapt to new power system if necessary
//stats.remove(BlockStat.powerCapacity);
}
};
powerInfinite = new PowerNode("powerinfinite"){
{
powerCapacity = 10000f;
maxNodes = 100;
outputsPower = true;
consumesPower = false;
shadow = "shadow-round-1";
}
// TODO Adapt to new power system if necessary
@Override
public void update(Tile tile){
super.update(tile);
tile.entity.power.amount = powerCapacity;
public float getPowerProduction(Tile tile){
return 10000f;
}
};
core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java
+3 -3
View File
@@ -71,19 +71,19 @@ public class DefenseBlocks extends BlockList implements ContentList{
}};
mendProjector = new MendProjector("mend-projector"){{
consumes.power(0.2f);
basePowerUse = 0.2f;
size = 2;
consumes.item(Items.phasefabric).optional(true);
}};
overdriveProjector = new OverdriveProjector("overdrive-projector"){{
consumes.power(0.35f);
basePowerUse = 0.35f;
size = 2;
consumes.item(Items.phasefabric).optional(true);
}};
forceProjector = new ForceProjector("force-projector"){{
consumes.power(0.2f);
basePowerUse = 0.2f;
size = 3;
consumes.item(Items.phasefabric).optional(true);
}};
core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java
+1 -1
View File
@@ -35,7 +35,7 @@ public class DistributionBlocks extends BlockList implements ContentList{
phaseConveyor = new ItemBridge("phase-conveyor"){{
range = 11;
hasPower = true;
consumes.power(0.05f);
basePowerUse = 0.05f;
}};
sorter = new Sorter("sorter");
core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java
+7 -5
View File
@@ -20,9 +20,10 @@ public class LiquidBlocks extends BlockList implements ContentList{
rotaryPump = new Pump("rotary-pump"){{
shadow = "shadow-rounded-2";
pumpAmount = 0.2f;
consumes.power(0.015f);
basePowerUse = 0.015f;
liquidCapacity = 30f;
powerCapacity = 20f;
// TODO Verify: No longer buffered
basePowerUse = 20f / 60f;
hasPower = true;
size = 2;
tier = 1;
@@ -31,10 +32,11 @@ public class LiquidBlocks extends BlockList implements ContentList{
thermalPump = new Pump("thermal-pump"){{
shadow = "shadow-rounded-2";
pumpAmount = 0.275f;
consumes.power(0.03f);
basePowerUse = 0.03f;
liquidCapacity = 40f;
hasPower = true;
powerCapacity = 20f;
// TODO Verify: No longer buffered
basePowerUse = 20f / 60f;
size = 2;
tier = 2;
}};
@@ -69,7 +71,7 @@ public class LiquidBlocks extends BlockList implements ContentList{
phaseConduit = new LiquidBridge("phase-conduit"){{
range = 11;
hasPower = true;
consumes.power(0.05f);
basePowerUse = 0.05f;
}};
}
}
core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java
+11 -12
View File
@@ -13,41 +13,40 @@ public class PowerBlocks extends BlockList implements ContentList{
@Override
public void load(){
combustionGenerator = new BurnerGenerator("combustion-generator"){{
powerOutput = 0.09f;
powerCapacity = 40f;
powerProduction = 0.09f;
itemDuration = 40f;
}};
thermalGenerator = new LiquidHeatGenerator("thermal-generator"){{
maxLiquidGenerate = 4f;
powerCapacity = 40f;
// TODO: Adapt to new power system
powerProduction = -1;
powerPerLiquid = 0.1f;
generateEffect = BlockFx.redgeneratespark;
size = 2;
}};
turbineGenerator = new TurbineGenerator("turbine-generator"){{
powerOutput = 0.28f;
powerCapacity = 40f;
// TODO: Adapt to new power system
powerProduction = 0.28f;
powerPerLiquid = 0.1f;
itemDuration = 30f;
powerPerLiquid = 0.7f;
consumes.liquid(Liquids.water, 0.05f);
size = 2;
}};
rtgGenerator = new DecayGenerator("rtg-generator"){{
powerCapacity = 40f;
size = 2;
powerOutput = 0.3f;
powerProduction = 0.3f;
itemDuration = 220f;
}};
solarPanel = new PowerGenerator("solar-panel"){{
powerGeneration = 0.0045f;
powerProduction = 0.0045f;
}};
largeSolarPanel = new PowerGenerator("solar-panel-large"){{
powerGeneration = 0.055f;
powerProduction = 0.055f;
size = 3;
}};
@@ -63,12 +62,12 @@ public class PowerBlocks extends BlockList implements ContentList{
}};
battery = new Battery("battery"){{
powerCapacity = 320f;
basePowerUse = 320f;
}};
batteryLarge = new Battery("battery-large"){{
size = 3;
powerCapacity = 2000f;
basePowerUse = 2000f;
}};
powerNode = new PowerNode("power-node"){{
core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java
+6 -6
View File
@@ -38,7 +38,7 @@ public class ProductionBlocks extends BlockList implements ContentList{
updateEffect = BlockFx.pulverizeMedium;
drillEffect = BlockFx.mineBig;
consumes.power(0.11f);
basePowerUse = 0.11f;
}};
blastDrill = new Drill("blast-drill"){{
@@ -53,7 +53,7 @@ public class ProductionBlocks extends BlockList implements ContentList{
rotateSpeed = 6f;
warmupSpeed = 0.01f;
consumes.power(0.3f);
basePowerUse = 0.3f;
}};
plasmaDrill = new Drill("plasma-drill"){{
@@ -70,7 +70,7 @@ public class ProductionBlocks extends BlockList implements ContentList{
drillEffect = BlockFx.mineHuge;
warmupSpeed = 0.005f;
consumes.power(0.7f);
basePowerUse = 0.7f;
}};
waterExtractor = new SolidPump("water-extractor"){{
@@ -80,7 +80,7 @@ public class ProductionBlocks extends BlockList implements ContentList{
liquidCapacity = 30f;
rotateSpeed = 1.4f;
consumes.power(0.09f);
basePowerUse = 0.09f;
}};
oilExtractor = new Fracker("oil-extractor"){{
@@ -93,7 +93,7 @@ public class ProductionBlocks extends BlockList implements ContentList{
liquidCapacity = 30f;
consumes.item(Items.sand);
consumes.power(0.3f);
basePowerUse = 0.3f;
consumes.liquid(Liquids.water, 0.15f);
}};
@@ -104,7 +104,7 @@ public class ProductionBlocks extends BlockList implements ContentList{
hasLiquids = true;
hasPower = true;
consumes.power(0.08f);
basePowerUse = 0.08f;
consumes.liquid(Liquids.water, 0.2f);
}};
core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java
+6 -6
View File
@@ -102,8 +102,8 @@ public class TurretBlocks extends BlockList implements ContentList{
recoil = 2f;
reload = 100f;
cooldown = 0.03f;
powerUsed = 20f;
powerCapacity = 60f;
powerUsed = 1 / 3f;
basePowerUse = 60f; // capacity
shootShake = 2f;
shootEffect = ShootFx.lancerLaserShoot;
smokeEffect = ShootFx.lancerLaserShootSmoke;
@@ -121,8 +121,8 @@ public class TurretBlocks extends BlockList implements ContentList{
shootShake = 1f;
shootCone = 40f;
rotatespeed = 8f;
powerUsed = 7f;
powerCapacity = 30f;
powerUsed = 7 / 30f;
basePowerUse = 30f; // capacity
range = 150f;
shootEffect = ShootFx.lightningShoot;
heatColor = Color.RED;
@@ -255,8 +255,8 @@ public class TurretBlocks extends BlockList implements ContentList{
recoil = 4f;
size = 4;
shootShake = 2f;
powerUsed = 60f;
powerCapacity = 120f;
powerUsed = 0.5f;
basePowerUse = 120f; // capacity
range = 160f;
reload = 200f;
firingMoveFract = 0.1f;
core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java
+8 -8
View File
@@ -20,7 +20,7 @@ public class UnitBlocks extends BlockList implements ContentList{
type = UnitTypes.spirit;
produceTime = 5700;
size = 2;
consumes.power(0.08f);
basePowerUse = 0.08f;
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.lead, 30)});
}};
@@ -28,7 +28,7 @@ public class UnitBlocks extends BlockList implements ContentList{
type = UnitTypes.phantom;
produceTime = 7300;
size = 2;
consumes.power(0.2f);
basePowerUse = 0.2f;
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 70), new ItemStack(Items.lead, 80), new ItemStack(Items.titanium, 80)});
}};
@@ -36,7 +36,7 @@ public class UnitBlocks extends BlockList implements ContentList{
type = UnitTypes.wraith;
produceTime = 1800;
size = 2;
consumes.power(0.1f);
basePowerUse = 0.1f;
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10), new ItemStack(Items.titanium, 10)});
}};
@@ -44,7 +44,7 @@ public class UnitBlocks extends BlockList implements ContentList{
type = UnitTypes.ghoul;
produceTime = 3600;
size = 3;
consumes.power(0.2f);
basePowerUse = 0.2f;
shadow = "shadow-round-3";
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.titanium, 30), new ItemStack(Items.plastanium, 20)});
}};
@@ -53,7 +53,7 @@ public class UnitBlocks extends BlockList implements ContentList{
type = UnitTypes.revenant;
produceTime = 8000;
size = 4;
consumes.power(0.3f);
basePowerUse = 0.3f;
shadow = "shadow-round-4";
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 80), new ItemStack(Items.titanium, 80), new ItemStack(Items.plastanium, 50)});
}};
@@ -62,7 +62,7 @@ public class UnitBlocks extends BlockList implements ContentList{
type = UnitTypes.dagger;
produceTime = 1700;
size = 2;
consumes.power(0.05f);
basePowerUse = 0.05f;
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10)});
}};
@@ -70,7 +70,7 @@ public class UnitBlocks extends BlockList implements ContentList{
type = UnitTypes.titan;
produceTime = 3400;
size = 3;
consumes.power(0.15f);
basePowerUse = 0.15f;
shadow = "shadow-round-3";
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 20), new ItemStack(Items.thorium, 30)});
}};
@@ -79,7 +79,7 @@ public class UnitBlocks extends BlockList implements ContentList{
type = UnitTypes.fortress;
produceTime = 5000;
size = 3;
consumes.power(0.2f);
basePowerUse = 0.2f;
shadow = "shadow-round-3";
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 40), new ItemStack(Items.thorium, 50)});
}};
core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java
+10 -8
View File
@@ -9,55 +9,57 @@ public class UpgradeBlocks extends BlockList{
@Override
public void load(){
// Note: MechPads are buffered; all basePowerUse values represent total capacity
alphaPad = new MechPad("alpha-mech-pad"){{
mech = Mechs.alpha;
size = 2;
powerCapacity = 50f;
basePowerUse = 50f;
}};
deltaPad = new MechPad("delta-mech-pad"){{
mech = Mechs.delta;
size = 2;
powerCapacity = 70f;
basePowerUse = 70f;
}};
tauPad = new MechPad("tau-mech-pad"){{
mech = Mechs.tau;
size = 2;
powerCapacity = 100f;
basePowerUse = 100f;
}};
omegaPad = new MechPad("omega-mech-pad"){{
mech = Mechs.omega;
size = 3;
powerCapacity = 120f;
basePowerUse = 120f;
}};
dartPad = new MechPad("dart-ship-pad"){{
mech = Mechs.dart;
size = 2;
powerCapacity = 50f;
basePowerUse = 50f;
shadow = "shadow-rounded-2";
}};
javelinPad = new MechPad("javelin-ship-pad"){{
mech = Mechs.javelin;
size = 2;
powerCapacity = 80f;
basePowerUse = 80f;
shadow = "shadow-rounded-2";
}};
tridentPad = new MechPad("trident-ship-pad"){{
mech = Mechs.trident;
size = 2;
powerCapacity = 100f;
basePowerUse = 100f;
shadow = "shadow-rounded-2";
}};
glaivePad = new MechPad("glaive-ship-pad"){{
mech = Mechs.glaive;
size = 3;
powerCapacity = 120f;
basePowerUse = 120f;
shadow = "shadow-round-3";
}};
}