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

Name fixes

Browse Source
This commit is contained in:
Anuken
2020-09-06 19:09:41 -04:00
parent 1d191f1914
commit 010a1594fa
22 changed files with 51 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ai/BlockIndexer.java
View File

@@ -148,7 +148,7 @@ public class BlockIndexer{
BuildingArray set = damagedTiles[team.id];
for(Building build : set){
if((!build.isValid() || build.team != team || !build.damaged()) || build.block instanceof BuildBlock){
if((!build.isValid() || build.team != team || !build.damaged()) || build.block instanceof ConstructBlock){
breturnArray.add(build);
}
}

4
core/src/mindustry/ai/types/BuilderAI.java
View File

@@ -5,7 +5,7 @@ import mindustry.entities.units.*;
import mindustry.game.Teams.*;
import mindustry.gen.*;
import mindustry.world.*;
import mindustry.world.blocks.BuildBlock.*;
import mindustry.world.blocks.ConstructBlock.*;
import static mindustry.Vars.*;
@@ -26,7 +26,7 @@ public class BuilderAI extends AIController{
BuildPlan req = builder.buildPlan();
boolean valid =
(req.tile().build instanceof BuildEntity && req.tile().<BuildEntity>bc().cblock == req.block) ||
(req.tile().build instanceof ConstructBuild && req.tile().<ConstructBuild>bc().cblock == req.block) ||
(req.breaking ?
Build.validBreak(unit.team(), req.x, req.y) :
Build.validPlace(req.block, unit.team(), req.x, req.y, req.rotation));

6
core/src/mindustry/content/Blocks.java
View File

@@ -131,8 +131,8 @@ public class Blocks implements ContentList{
//Registers build blocks
//no reference is needed here since they can be looked up by name later
for(int i = 1; i <= BuildBlock.maxSize; i++){
new BuildBlock(i);
for(int i = 1; i <= ConstructBlock.maxSize; i++){
new ConstructBlock(i);
}
deepwater = new Floor("deepwater"){{
@@ -1513,7 +1513,7 @@ public class Blocks implements ContentList{
rotateSpeed = 10;
range = 85f;
consumes.powerCond(3f, (TractorBeamEntity e) -> e.target != null);
consumes.powerCond(3f, (TractorBeamBuild e) -> e.target != null);
}};
swarmer = new ItemTurret("swarmer"){{

6
core/src/mindustry/core/Logic.java
View File

@@ -15,7 +15,7 @@ import mindustry.type.*;
import mindustry.type.Weather.*;
import mindustry.world.*;
import mindustry.world.blocks.*;
import mindustry.world.blocks.BuildBlock.*;
import mindustry.world.blocks.ConstructBlock.*;
import mindustry.world.blocks.storage.CoreBlock.*;
import java.util.*;
@@ -41,9 +41,9 @@ public class Logic implements ApplicationListener{
//skip null entities or un-rebuildables, for obvious reasons; also skip client since they can't modify these requests
if(tile.build == null || !tile.block().rebuildable || net.client()) return;
if(block instanceof BuildBlock){
if(block instanceof ConstructBlock){
BuildEntity entity = tile.bc();
ConstructBuild entity = tile.bc();
//update block to reflect the fact that something was being constructed
if(entity.cblock != null && entity.cblock.synthetic()){

2
core/src/mindustry/entities/bullet/HealBulletType.java
View File

@@ -46,7 +46,7 @@ public class HealBulletType extends BulletType{
public void hitTile(Bullet b, Building tile){
super.hit(b);
if(tile.team == b.team && !(tile.block() instanceof BuildBlock)){
if(tile.team == b.team && !(tile.block() instanceof ConstructBlock)){
Fx.healBlockFull.at(tile.x, tile.y, tile.block().size, Pal.heal);
tile.heal(healPercent / 100f * tile.maxHealth());
}

14
core/src/mindustry/entities/comp/BuilderComp.java
View File

@@ -16,7 +16,7 @@ import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.world.*;
import mindustry.world.blocks.*;
import mindustry.world.blocks.BuildBlock.*;
import mindustry.world.blocks.ConstructBlock.*;
import java.util.*;
@@ -74,7 +74,7 @@ abstract class BuilderComp implements Unitc{
rotation = Mathf.slerpDelta(rotation, angleTo(tile), 0.4f);
}
if(!(tile.block() instanceof BuildBlock)){
if(!(tile.block() instanceof ConstructBlock)){
if(!current.initialized && !current.breaking && Build.validPlace(current.block, team(), current.x, current.y, current.rotation)){
boolean hasAll = infinite || !Structs.contains(current.block.requirements, i -> core != null && !core.items.has(i.item));
@@ -94,18 +94,18 @@ abstract class BuilderComp implements Unitc{
return;
}
if(tile.build instanceof BuildEntity && !current.initialized){
if(tile.build instanceof ConstructBuild && !current.initialized){
Core.app.post(() -> Events.fire(new BuildSelectEvent(tile, team(), (Builderc)this, current.breaking)));
current.initialized = true;
}
//if there is no core to build with or no build entity, stop building!
if((core == null && !infinite) || !(tile.build instanceof BuildEntity)){
if((core == null && !infinite) || !(tile.build instanceof ConstructBuild)){
return;
}
//otherwise, update it.
BuildEntity entity = tile.bc();
ConstructBuild entity = tile.bc();
if(current.breaking){
entity.deconstruct(base(), core, 1f / entity.buildCost * Time.delta * type().buildSpeed * state.rules.buildSpeedMultiplier);
@@ -179,8 +179,8 @@ abstract class BuilderComp implements Unitc{
plans.remove(replace);
}
Tile tile = world.tile(place.x, place.y);
if(tile != null && tile.build instanceof BuildEntity){
place.progress = tile.<BuildEntity>bc().progress;
if(tile != null && tile.build instanceof ConstructBuild){
place.progress = tile.<ConstructBuild>bc().progress;
}
if(tail){
plans.addLast(place);

4
core/src/mindustry/game/Schematics.java
View File

@@ -346,7 +346,7 @@ public class Schematics implements Loadable{
for(int cy = y; cy <= y2; cy++){
Building linked = world.build(cx, cy);
if(linked != null &&linked.block().isVisible() && !(linked.block() instanceof BuildBlock)){
if(linked != null &&linked.block().isVisible() && !(linked.block() instanceof ConstructBlock)){
int top = linked.block().size/2;
int bot = linked.block().size % 2 == 1 ? -linked.block().size/2 : -(linked.block().size - 1)/2;
minx = Math.min(linked.tileX() + bot, minx);
@@ -374,7 +374,7 @@ public class Schematics implements Loadable{
for(int cy = oy; cy <= oy2; cy++){
Building tile = world.build(cx, cy);
if(tile != null && !counted.contains(tile.pos()) && !(tile.block() instanceof BuildBlock)
if(tile != null && !counted.contains(tile.pos()) && !(tile.block() instanceof ConstructBlock)
&& (tile.block().isVisible() || (tile.block() instanceof CoreBlock))){
Object config = tile.config();

4
core/src/mindustry/input/InputHandler.java
View File

@@ -31,7 +31,7 @@ import mindustry.type.*;
import mindustry.ui.fragments.*;
import mindustry.world.*;
import mindustry.world.blocks.*;
import mindustry.world.blocks.BuildBlock.*;
import mindustry.world.blocks.ConstructBlock.*;
import mindustry.world.blocks.payloads.*;
import mindustry.world.blocks.power.*;
import mindustry.world.blocks.storage.CoreBlock.*;
@@ -405,7 +405,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
public boolean requestMatches(BuildPlan request){
Tile tile = world.tile(request.x, request.y);
return tile != null && tile.block() instanceof BuildBlock && tile.<BuildEntity>bc().cblock == request.block;
return tile != null && tile.block() instanceof ConstructBlock && tile.<ConstructBuild>bc().cblock == request.block;
}
public void drawBreaking(int x, int y){

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

@@ -241,8 +241,8 @@ public class ContentParser{
readFields(block, value, true);
if(block.size > BuildBlock.maxSize){
throw new IllegalArgumentException("Blocks cannot be larger than " + BuildBlock.maxSize);
if(block.size > ConstructBlock.maxSize){
throw new IllegalArgumentException("Blocks cannot be larger than " + ConstructBlock.maxSize);
}
//add research tech node

4
core/src/mindustry/ui/fragments/PlacementFragment.java
View File

@@ -23,7 +23,7 @@ import mindustry.type.*;
import mindustry.ui.*;
import mindustry.world.*;
import mindustry.world.blocks.*;
import mindustry.world.blocks.BuildBlock.*;
import mindustry.world.blocks.ConstructBlock.*;
import static mindustry.Vars.*;
@@ -95,7 +95,7 @@ public class PlacementFragment extends Fragment{
if(Core.input.keyDown(Binding.pick) && player.isBuilder()){ //mouse eyedropper select
Building tile = world.buildWorld(Core.input.mouseWorld().x, Core.input.mouseWorld().y);
Block tryRecipe = tile == null ? null : tile.block() instanceof BuildBlock ? ((BuildEntity)tile).cblock : tile.block;
Block tryRecipe = tile == null ? null : tile.block() instanceof ConstructBlock ? ((ConstructBuild)tile).cblock : tile.block;
Object tryConfig = tile == null ? null : tile.config();
for(BuildPlan req : player.builder().plans()){

14
core/src/mindustry/world/Build.java
View File

@@ -10,7 +10,7 @@ import mindustry.entities.*;
import mindustry.game.EventType.*;
import mindustry.game.*;
import mindustry.world.blocks.*;
import mindustry.world.blocks.BuildBlock.*;
import mindustry.world.blocks.ConstructBlock.*;
import static mindustry.Vars.*;
@@ -32,10 +32,10 @@ public class Build{
int rotation = tile.build != null ? tile.build.rotation : 0;
Block previous = tile.block();
Block sub = BuildBlock.get(previous.size);
Block sub = ConstructBlock.get(previous.size);
tile.setBlock(sub, team, rotation);
tile.<BuildEntity>bc().setDeconstruct(previous);
tile.<ConstructBuild>bc().setDeconstruct(previous);
tile.build.health(tile.build.maxHealth() * prevPercent);
Core.app.post(() -> Events.fire(new BlockBuildBeginEvent(tile, team, true)));
@@ -54,12 +54,12 @@ public class Build{
if(tile == null) return;
Block previous = tile.block();
Block sub = BuildBlock.get(result.size);
Block sub = ConstructBlock.get(result.size);
result.beforePlaceBegan(tile, previous);
tile.setBlock(sub, team, rotation);
tile.<BuildEntity>bc().setConstruct(previous, result);
tile.<ConstructBuild>bc().setConstruct(previous, result);
result.placeBegan(tile, previous);
@@ -91,7 +91,7 @@ public class Build{
}
if(type.isMultiblock()){
if((type.canReplace(tile.block()) || (tile.block instanceof BuildBlock && tile.<BuildEntity>bc().cblock == type)) &&
if((type.canReplace(tile.block()) || (tile.block instanceof ConstructBlock && tile.<ConstructBuild>bc().cblock == type)) &&
type.canPlaceOn(tile, team) && tile.interactable(team)){
//if the block can be replaced but the sizes differ, check all the spaces around the block to make sure it can fit
@@ -145,7 +145,7 @@ public class Build{
&& (!tile.floor().isDeep() || type.floating || type.requiresWater || type.placeableLiquid)
&& tile.floor().placeableOn
&& (!type.requiresWater || tile.floor().liquidDrop == Liquids.water)
&& (((type.canReplace(tile.block()) || (tile.block instanceof BuildBlock && tile.<BuildEntity>bc().cblock == type))
&& (((type.canReplace(tile.block()) || (tile.block instanceof ConstructBlock && tile.<ConstructBuild>bc().cblock == type))
&& !(type == tile.block() && (tile.build != null && rotation == tile.build.rotation) && type.rotate)) || tile.block().alwaysReplace || tile.block() == Blocks.air)
&& tile.block().isMultiblock() == type.isMultiblock() && type.canPlaceOn(tile, team);
}

17
core/src/mindustry/world/blocks/BuildBlock.java → core/src/mindustry/world/blocks/ConstructBlock.java
View File

@@ -23,28 +23,29 @@ import mindustry.world.modules.*;
import static mindustry.Vars.*;
public class BuildBlock extends Block{
/** A block in the process of construction. */
public class ConstructBlock extends Block{
public static final int maxSize = 16;
private static final BuildBlock[] buildBlocks = new BuildBlock[maxSize];
private static final ConstructBlock[] consBlocks = new ConstructBlock[maxSize];
private static long lastTime = 0;
private static int pitchSeq = 0;
private static long lastPlayed;
public BuildBlock(int size){
public ConstructBlock(int size){
super("build" + size);
this.size = size;
update = true;
health = 20;
consumesTap = true;
solidifes = true;
buildBlocks[size - 1] = this;
consBlocks[size - 1] = this;
}
/** Returns a BuildBlock by size. */
public static BuildBlock get(int size){
if(size > maxSize) throw new IllegalArgumentException("No. Don't place BuildBlocks of size greater than " + maxSize);
return buildBlocks[size - 1];
public static ConstructBlock get(int size){
if(size > maxSize) throw new IllegalArgumentException("No. Don't place ConstructBlock of size greater than " + maxSize);
return consBlocks[size - 1];
}
@Remote(called = Loc.server)
@@ -117,7 +118,7 @@ public class BuildBlock extends Block{
return true;
}
public class BuildEntity extends Building{
public class ConstructBuild extends Building{
/**
* The recipe of the block that is being constructed.
* If there is no recipe for this block, as is the case with rocks, 'previous' is used.

2
core/src/mindustry/world/blocks/defense/PointDefenseTurret.java
View File

@@ -60,7 +60,7 @@ public class PointDefenseTurret extends Block{
stats.add(BlockStat.reload, 60f / reloadTime, StatUnit.none);
}
public class PointDefenseEntity extends Building{
public class PointDefenseBuild extends Building{
public float rotation = 90, reload;
public @Nullable Bullet target;

2
core/src/mindustry/world/blocks/defense/ShockMine.java
View File

@@ -27,7 +27,7 @@ public class ShockMine extends Block{
rebuildable = false;
}
public class ShockMineEntity extends Building{
public class ShockMineBuild extends Building{
@Override
public void drawTeam(){

2
core/src/mindustry/world/blocks/defense/TractorBeamTurret.java
View File

@@ -61,7 +61,7 @@ public class TractorBeamTurret extends Block{
stats.add(BlockStat.damage, damage * 60f, StatUnit.perSecond);
}
public class TractorBeamEntity extends Building{
public class TractorBeamBuild extends Building{
public float rotation = 90;
public @Nullable Unit target;
public float lastX, lastY, strength;

2
core/src/mindustry/world/blocks/liquid/LiquidRouter.java
View File

@@ -11,7 +11,7 @@ public class LiquidRouter extends LiquidBlock{
noUpdateDisabled = true;
}
public class LiquidRouterEntity extends LiquidBuild{
public class LiquidRouterBuild extends LiquidBuild{
@Override
public void updateTile(){
if(liquids.total() > 0.01f){

4
core/src/mindustry/world/blocks/logic/LogicBlock.java
View File

@@ -16,7 +16,7 @@ import mindustry.logic.LAssembler.*;
import mindustry.logic.LExecutor.*;
import mindustry.ui.*;
import mindustry.world.*;
import mindustry.world.blocks.BuildBlock.*;
import mindustry.world.blocks.ConstructBlock.*;
import mindustry.world.meta.*;
import java.io.*;
@@ -413,7 +413,7 @@ public class LogicBlock extends Block{
}
public boolean validLink(Building other){
return other != null && other.isValid() && other.team == team && other.within(this, range + other.block.size*tilesize/2f) && !(other instanceof BuildEntity);
return other != null && other.isValid() && other.team == team && other.within(this, range + other.block.size*tilesize/2f) && !(other instanceof ConstructBuild);
}

5
core/src/mindustry/world/blocks/payloads/BlockPayload.java
View File

@@ -39,11 +39,6 @@ public class BlockPayload implements Payload{
return entity.block.size * tilesize;
}
@Override
public boolean fits(){
return entity.block().size < 3;
}
@Override
public void write(Writes write){
write.b(payloadBlock);

4
core/src/mindustry/world/blocks/payloads/Payload.java
View File

@@ -6,7 +6,7 @@ import mindustry.game.*;
import mindustry.gen.*;
import mindustry.world.*;
import static mindustry.Vars.content;
import static mindustry.Vars.*;
public interface Payload{
int payloadUnit = 0, payloadBlock = 1;
@@ -27,7 +27,7 @@ public interface Payload{
/** @return whether this payload fits on a standard 3x3 conveyor. */
default boolean fits(){
return true;
return size() / tilesize <= 2.4f;
}
/** writes the payload for saving. */

5
core/src/mindustry/world/blocks/payloads/UnitPayload.java
View File

@@ -15,11 +15,6 @@ public class UnitPayload implements Payload{
this.unit = unit;
}
@Override
public boolean fits(){
return unit.hitSize <= 16f;
}
@Override
public void write(Writes write){
write.b(payloadUnit);