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

pointless casts begone

Browse Source
This commit is contained in:
Anuken
2021-08-17 21:45:13 -04:00
parent d1271f3e4b
commit 8e179552ec
7 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/content/StatusEffects.java
View File

@@ -4,6 +4,7 @@ import arc.*;
import arc.graphics.*; import arc.graphics.*;
import arc.math.*; import arc.math.*;
import mindustry.ctype.*; import mindustry.ctype.*;
import mindustry.game.*;
import mindustry.game.EventType.*; import mindustry.game.EventType.*;
import mindustry.type.*; import mindustry.type.*;
import mindustry.graphics.*; import mindustry.graphics.*;
@@ -163,7 +164,7 @@ public class StatusEffects implements ContentList{
}}; }};
boss = new StatusEffect("boss"){{ boss = new StatusEffect("boss"){{
color = Pal.health; color = Team.sharded.color;
permanent = true; permanent = true;
damageMultiplier = 1.3f; damageMultiplier = 1.3f;
healthMultiplier = 1.5f; healthMultiplier = 1.5f;

4
core/src/mindustry/core/Renderer.java
View File

@@ -105,8 +105,8 @@ public class Renderer implements ApplicationListener{
for(int i = 0; i < splashes.length; i++) splashes[i] = atlas.find("splash-" + i); for(int i = 0; i < splashes.length; i++) splashes[i] = atlas.find("splash-" + i);
assets.load("sprites/clouds.png", Texture.class).loaded = t -> { assets.load("sprites/clouds.png", Texture.class).loaded = t -> {
((Texture)t).setWrap(TextureWrap.repeat); t.setWrap(TextureWrap.repeat);
((Texture)t).setFilter(TextureFilter.linear); t.setFilter(TextureFilter.linear);
}; };
} }

6
core/src/mindustry/graphics/Shaders.java
View File

@@ -234,7 +234,7 @@ public class Shaders{
super(frag); super(frag);
Core.assets.load("sprites/space.png", Texture.class).loaded = t -> { Core.assets.load("sprites/space.png", Texture.class).loaded = t -> {
texture = (Texture)t; texture = t;
texture.setFilter(TextureFilter.linear); texture.setFilter(TextureFilter.linear);
texture.setWrap(TextureWrap.mirroredRepeat); texture.setWrap(TextureWrap.mirroredRepeat);
}; };
@@ -273,8 +273,8 @@ public class Shaders{
public void loadNoise(){ public void loadNoise(){
Core.assets.load("sprites/" + textureName() + ".png", Texture.class).loaded = t -> { Core.assets.load("sprites/" + textureName() + ".png", Texture.class).loaded = t -> {
((Texture)t).setFilter(TextureFilter.linear); t.setFilter(TextureFilter.linear);
((Texture)t).setWrap(TextureWrap.repeat); t.setWrap(TextureWrap.repeat);
}; };
} }

2
core/src/mindustry/maps/Maps.java
View File

@@ -381,7 +381,7 @@ public class Maps{
//try to load preview //try to load preview
if(map.previewFile().exists()){ if(map.previewFile().exists()){
//this may fail, but calls queueNewPreview //this may fail, but calls queueNewPreview
Core.assets.load(new AssetDescriptor<>(map.previewFile().path() + "." + mapExtension, Texture.class, new MapPreviewParameter(map))).loaded = t -> map.texture = (Texture)t; Core.assets.load(new AssetDescriptor<>(map.previewFile().path() + "." + mapExtension, Texture.class, new MapPreviewParameter(map))).loaded = t -> map.texture = t;
try{ try{
readCache(map); readCache(map);

6
core/src/mindustry/ui/Fonts.java
View File

@@ -74,19 +74,19 @@ public class Fonts{
largeIcons.clear(); largeIcons.clear();
FreeTypeFontParameter param = fontParameter(); FreeTypeFontParameter param = fontParameter();
Core.assets.load("default", Font.class, new FreeTypeFontLoaderParameter(mainFont, param)).loaded = f -> Fonts.def = (Font)f; Core.assets.load("default", Font.class, new FreeTypeFontLoaderParameter(mainFont, param)).loaded = f -> Fonts.def = f;
Core.assets.load("icon", Font.class, new FreeTypeFontLoaderParameter("fonts/icon.ttf", new FreeTypeFontParameter(){{ Core.assets.load("icon", Font.class, new FreeTypeFontLoaderParameter("fonts/icon.ttf", new FreeTypeFontParameter(){{
size = 30; size = 30;
incremental = true; incremental = true;
characters = "\0"; characters = "\0";
}})).loaded = f -> Fonts.icon = (Font)f; }})).loaded = f -> Fonts.icon = f;
Core.assets.load("iconLarge", Font.class, new FreeTypeFontLoaderParameter("fonts/icon.ttf", new FreeTypeFontParameter(){{ Core.assets.load("iconLarge", Font.class, new FreeTypeFontLoaderParameter("fonts/icon.ttf", new FreeTypeFontParameter(){{
size = 48; size = 48;
incremental = false; incremental = false;
characters = "\0" + Iconc.all; characters = "\0" + Iconc.all;
borderWidth = 5f; borderWidth = 5f;
borderColor = Color.darkGray; borderColor = Color.darkGray;
}})).loaded = f -> Fonts.iconLarge = (Font)f; }})).loaded = f -> Fonts.iconLarge = f;
} }
public static TextureRegion getLargeIcon(String name){ public static TextureRegion getLargeIcon(String name){

2
core/src/mindustry/ui/dialogs/SchematicsDialog.java
View File

@@ -41,7 +41,7 @@ public class SchematicsDialog extends BaseDialog{
public SchematicsDialog(){ public SchematicsDialog(){
super("@schematics"); super("@schematics");
Core.assets.load("sprites/schematic-background.png", Texture.class).loaded = t -> ((Texture)t).setWrap(TextureWrap.repeat); Core.assets.load("sprites/schematic-background.png", Texture.class).loaded = t -> t.setWrap(TextureWrap.repeat);
tags = Core.settings.getJson("schematic-tags", Seq.class, String.class, Seq::new); tags = Core.settings.getJson("schematic-tags", Seq.class, String.class, Seq::new);

2
gradle.properties
View File

@@ -11,4 +11,4 @@ android.useAndroidX=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
http.socketTimeout=80000 http.socketTimeout=80000
http.connectionTimeout=80000 http.connectionTimeout=80000
archash=f4e8a35c46e28dc68bb2cab17e42ef6db15ae72f archash=f50ceb463ce4cc7e0b09a7817b12d98c43f00068