diff --git a/annotations/src/main/resources/classids.properties b/annotations/src/main/resources/classids.properties index e69de29bb2..cb9d7967ca 100644 --- a/annotations/src/main/resources/classids.properties +++ b/annotations/src/main/resources/classids.properties @@ -0,0 +1,23 @@ +#Maps entity names to IDs. Autogenerated. + +atrax=0 +block=1 +flare=2 +mace=3 +mega=4 +mindustry.entities.comp.BuildingComp=5 +mindustry.entities.comp.BulletComp=6 +mindustry.entities.comp.DecalComp=7 +mindustry.entities.comp.EffectStateComp=8 +mindustry.entities.comp.FireComp=9 +mindustry.entities.comp.LaunchCoreComp=10 +mindustry.entities.comp.PlayerComp=11 +mindustry.entities.comp.PuddleComp=12 +mindustry.type.Weather.WeatherStateComp=13 +mindustry.world.blocks.campaign.LaunchPad.LaunchPayloadComp=14 +mono=15 +nova=16 +poly=17 +pulsar=18 +risso=19 +spiroct=20 \ No newline at end of file diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 77cbf73a84..eba495d38a 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -54,6 +54,7 @@ schematic.delete.confirm = This schematic will be utterly eradicated. schematic.rename = Rename Schematic schematic.info = {0}x{1}, {2} blocks schematic.disabled = [scarlet]Schematics are not allowed! +schematic.copydisabled = [scarlet]Copying isn't allowed! stat.wave = Waves Defeated:[accent] {0} stat.enemiesDestroyed = Enemies Destroyed:[accent] {0} diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java index 8c277977fb..9efdc32944 100644 --- a/core/src/mindustry/game/Rules.java +++ b/core/src/mindustry/game/Rules.java @@ -40,6 +40,8 @@ public class Rules{ public boolean reactorExplosions = true; /** Whether schematics are allowed */ public boolean schematicAllowed = true; + /** Whether copying is allowed */ + public boolean copyAllowed = true; /** Whether units use and require ammo. */ public boolean unitAmmo = false; /** How fast unit pads build units. */ diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index 3a497b9c93..a4eb342f0a 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -401,8 +401,8 @@ public class DesktopInput extends InputHandler{ } if(Core.input.keyRelease(Binding.schematic_select) && !Core.scene.hasKeyboard()){ - if(!state.rules.schematicAllowed){ - ui.showInfoToast("@schematic.disabled", 3f); + if(!state.rules.copyAllowed){ + ui.showInfoToast("@schematic.copydisabled", 3f); }else { lastSchematic = schematics.create(schemX, schemY, rawCursorX, rawCursorY); useSchematic(lastSchematic);