Possible save fix / Place arrow de-mushroomified / Fixed descriptions

This commit is contained in:
Anuken
2019-02-10 11:46:18 -05:00
parent a9778e6e68
commit 897b90f044
13 changed files with 779 additions and 814 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 109 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 95 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 104 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 94 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@@ -783,7 +783,7 @@ block.solidifer.description = Cools lava to stone at a fast pace.
block.melter.description = Heats up stone to very high temperatures to obtain lava. block.melter.description = Heats up stone to very high temperatures to obtain lava.
block.incinerator.description = Gets rid of any excess item or liquid. block.incinerator.description = Gets rid of any excess item or liquid.
block.biomattercompressor.description = Compresses biomatter in order to retrieve oil. block.biomattercompressor.description = Compresses biomatter in order to retrieve oil.
block.separator.description = Exposes stone to water pressure in order to obtain various minerals contained in the stone. block.separator.description = Extracts useful minerals from slag.
block.centrifuge.description = More efficient than the separator, but also more expensive to build and requires power. block.centrifuge.description = More efficient than the separator, but also more expensive to build and requires power.
block.power-node.description = Transmits power to connected nodes. Up to four power sources, sinks or nodes can be connected. The node will receive power from or supply power to any adjacent blocks. block.power-node.description = Transmits power to connected nodes. Up to four power sources, sinks or nodes can be connected. The node will receive power from or supply power to any adjacent blocks.
block.power-node-large.description = Has a larger radius than the power node and connects to up to six power sources, sinks or nodes. block.power-node-large.description = Has a larger radius than the power node and connects to up to six power sources, sinks or nodes.
@@ -791,7 +791,7 @@ block.battery.description = Stores power whenever there is an abundance and prov
block.battery-large.description = Stores much more power than a regular battery. block.battery-large.description = Stores much more power than a regular battery.
block.combustion-generator.description = Generates power by burning oil or flammable materials. block.combustion-generator.description = Generates power by burning oil or flammable materials.
block.turbine-generator.description = More efficient than a combustion generator, but requires additional water. block.turbine-generator.description = More efficient than a combustion generator, but requires additional water.
block.thermal-generator.description = Generates a large amount of power from lava. block.thermal-generator.description = Generates power when placed in hot locations.
block.solar-panel.description = Provides a small amount of power from the sun. block.solar-panel.description = Provides a small amount of power from the sun.
block.solar-panel-large.description = Provides much better power supply than a standard solar panel, but is also much more expensive to build. block.solar-panel-large.description = Provides much better power supply than a standard solar panel, but is also much more expensive to build.
block.thorium-reactor.description = Generates huge amounts of power from highly radioactive thorium. Requires constant cooling. Will explode violently if insufficient amounts of coolant are supplied. Power output depends on fullness, with base power generated at half capacity. block.thorium-reactor.description = Generates huge amounts of power from highly radioactive thorium. Requires constant cooling. Will explode violently if insufficient amounts of coolant are supplied. Power output depends on fullness, with base power generated at half capacity.

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

View File

@@ -445,11 +445,11 @@ public class Blocks implements ContentList{
results = new ItemStack[]{ results = new ItemStack[]{
new ItemStack(Items.copper, 5), new ItemStack(Items.copper, 5),
new ItemStack(Items.lead, 3), new ItemStack(Items.lead, 3),
new ItemStack(Items.graphite, 2),
new ItemStack(Items.titanium, 2) new ItemStack(Items.titanium, 2)
}; };
hasPower = true; hasPower = true;
filterTime = 30f; filterTime = 30f;
health = 50 * 4;
spinnerLength = 1.5f; spinnerLength = 1.5f;
spinnerRadius = 3.5f; spinnerRadius = 3.5f;
spinnerThickness = 1.5f; spinnerThickness = 1.5f;
@@ -457,7 +457,7 @@ public class Blocks implements ContentList{
size = 2; size = 2;
consumes.power(1f); consumes.power(1f);
consumes.liquid(Liquids.slag, 0.1f); consumes.liquid(Liquids.slag, 0.09f);
}}; }};
cultivator = new Cultivator("cultivator"){{ cultivator = new Cultivator("cultivator"){{

View File

@@ -301,6 +301,11 @@ public class Control implements ApplicationListener{
inputHandler.updateController(); inputHandler.updateController();
} }
//autosave global data every second if it's modified
if(timer.get(1, 60)){
data.checkSave();
}
if(!state.is(State.menu)){ if(!state.is(State.menu)){
for(InputHandler input : inputs){ for(InputHandler input : inputs){
input.update(); input.update();
@@ -316,11 +321,6 @@ public class Control implements ApplicationListener{
} }
} }
//autosave global data every second if it's modified
if(timer.get(1, 60)){
data.checkSave();
}
//auto-update rpc every 5 seconds //auto-update rpc every 5 seconds
if(timer.get(0, 60 * 5)){ if(timer.get(0, 60 * 5)){
Platform.instance.updateRPC(); Platform.instance.updateRPC();

View File

@@ -19,7 +19,7 @@ public class ItemImage extends Stack{
} }
public ItemImage(ItemStack stack){ public ItemImage(ItemStack stack){
add(new Image(stack.item.icon(Icon.large))); add(new Image(stack.item.icon(Icon.medium)));
if(stack.amount != 0){ if(stack.amount != 0){
Table t = new Table().left().bottom(); Table t = new Table().left().bottom();

View File

@@ -211,7 +211,7 @@ public class TechTreeDialog extends FloatingDialog{
list.left(); list.left();
list.addImage(req.item.getContentIcon()).size(8 * 3).padRight(3); list.addImage(req.item.getContentIcon()).size(8 * 3).padRight(3);
list.add(req.item.localizedName()).color(Color.LIGHT_GRAY); list.add(req.item.localizedName()).color(Color.LIGHT_GRAY);
list.add(" " + Math.min(data.items().get(req.item, 0), req.amount) + " / " + req.amount) list.add(" " + Math.min(data.getItem(req.item), req.amount) + " / " + req.amount)
.color(data.has(req.item, req.amount) ? Color.LIGHT_GRAY : Color.SCARLET); .color(data.has(req.item, req.amount) ? Color.LIGHT_GRAY : Color.SCARLET);
}).fillX().left(); }).fillX().left();
t.row(); t.row();