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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-10-09 15:18:13 -04:00
parent 81633dace4
commit 7da400608c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/content/TechTree.java
View File

@@ -110,8 +110,6 @@ public class TechTree implements ContentList{
node(Items.coal, with(Items.lead, 3000), () -> { node(Items.coal, with(Items.lead, 3000), () -> {
node(Items.graphite, with(Items.coal, 1000), () -> { node(Items.graphite, with(Items.coal, 1000), () -> {
node(illuminator, () -> {
});
node(graphitePress, () -> { node(graphitePress, () -> {
node(Items.titanium, with(Items.graphite, 6000, Items.copper, 10000, Items.lead, 10000), () -> { node(Items.titanium, with(Items.graphite, 6000, Items.copper, 10000, Items.lead, 10000), () -> {
@@ -230,6 +228,9 @@ public class TechTree implements ContentList{
}); });
}); });
}); });
node(illuminator, () -> {
});
}); });
}); });

4
core/src/mindustry/mod/ContentParser.java
View File

@@ -318,8 +318,8 @@ public class ContentParser{
private <T extends Content> TypeParser<T> parser(ContentType type, Func<String, T> constructor){ private <T extends Content> TypeParser<T> parser(ContentType type, Func<String, T> constructor){
return (mod, name, value) -> { return (mod, name, value) -> {
T item; T item;
if(Vars.content.getByName(type, name) != null){ if(locate(type, name) != null){
item = (T)Vars.content.getByName(type, name); item = (T)locate(type, name);
readBundle(type, name, value); readBundle(type, name, value);
}else{ }else{
readBundle(type, name, value); readBundle(type, name, value);