Merge pull request #14 from uujuju1/erekir

v7 pull request
uujuju1 · May 15, 2022 · 628ccee · 628ccee
2 parents 1fabbd3 + 474dcd7
commit 628ccee
Show file tree

Hide file tree

Showing 63 changed files with 361 additions and 346 deletions.
diff --git a/assets/sprites/blocks/production/mantle-pulverizer-bottom.png b/assets/sprites/blocks/production/mantle-pulverizer-bottom.png
diff --git a/assets/sprites/blocks/production/mantle-pulverizer-light.png b/assets/sprites/blocks/production/mantle-pulverizer-light.png
diff --git a/assets/sprites/blocks/production/mantle-pulverizer.png b/assets/sprites/blocks/production/mantle-pulverizer.png
diff --git a/assets/sprites/blocks/turrets/acidic.png b/assets/sprites/blocks/turrets/acidic.png
diff --git a/assets/sprites/blocks/turrets/base/acidic-base.png b/assets/sprites/blocks/turrets/base/acidic-base.png
diff --git a/assets/sprites/blocks/turrets/base/corrosive-base.png b/assets/sprites/blocks/turrets/base/corrosive-base.png
diff --git a/assets/sprites/blocks/turrets/base/granite-base.png b/assets/sprites/blocks/turrets/base/granite-base.png
diff --git a/assets/sprites/blocks/turrets/base/hammer-base.png b/assets/sprites/blocks/turrets/base/hammer-base.png
diff --git a/assets/sprites/blocks/turrets/base/press-base.png b/assets/sprites/blocks/turrets/base/press-base.png
diff --git a/assets/sprites/blocks/turrets/base/rain-base.png b/assets/sprites/blocks/turrets/base/rain-base.png
diff --git a/assets/sprites/blocks/turrets/base/toxic-base.png b/assets/sprites/blocks/turrets/base/toxic-base.png
diff --git a/assets/sprites/blocks/turrets/base/uno-base.png b/assets/sprites/blocks/turrets/base/uno-base.png
diff --git a/assets/sprites/blocks/turrets/calenmite/hammer-cannon.png b/assets/sprites/blocks/turrets/calenmite/hammer-cannon.png
diff --git a/assets/sprites/blocks/turrets/calenmite/hammer-preview.png b/assets/sprites/blocks/turrets/calenmite/hammer-preview.png
diff --git a/assets/sprites/blocks/turrets/calenmite/hammer-support.png b/assets/sprites/blocks/turrets/calenmite/hammer-support.png
diff --git a/assets/sprites/blocks/turrets/calenmite/hammer.png b/assets/sprites/blocks/turrets/calenmite/hammer.png
diff --git a/assets/sprites/blocks/turrets/calenmite/press-cannon.png b/assets/sprites/blocks/turrets/calenmite/press-cannon.png
diff --git a/assets/sprites/blocks/turrets/calenmite/press-preview.png b/assets/sprites/blocks/turrets/calenmite/press-preview.png
diff --git a/assets/sprites/blocks/turrets/calenmite/press-wing-l.png b/assets/sprites/blocks/turrets/calenmite/press-wing-l.png
diff --git a/assets/sprites/blocks/turrets/calenmite/press-wing-r.png b/assets/sprites/blocks/turrets/calenmite/press-wing-r.png
diff --git a/assets/sprites/blocks/turrets/calenmite/press.png b/assets/sprites/blocks/turrets/calenmite/press.png
diff --git a/assets/sprites/blocks/turrets/copremite/acidic-preview.png b/assets/sprites/blocks/turrets/copremite/acidic-preview.png
diff --git a/assets/sprites/blocks/turrets/copremite/acidic-wing-l.png b/assets/sprites/blocks/turrets/copremite/acidic-wing-l.png
diff --git a/assets/sprites/blocks/turrets/copremite/acidic-wing-r.png b/assets/sprites/blocks/turrets/copremite/acidic-wing-r.png
diff --git a/assets/sprites/blocks/turrets/copremite/acidic.png b/assets/sprites/blocks/turrets/copremite/acidic.png
diff --git a/assets/sprites/blocks/turrets/copremite/corrosive-blade-l.png b/assets/sprites/blocks/turrets/copremite/corrosive-blade-l.png
diff --git a/assets/sprites/blocks/turrets/copremite/corrosive-blade-r.png b/assets/sprites/blocks/turrets/copremite/corrosive-blade-r.png
diff --git a/assets/sprites/blocks/turrets/copremite/corrosive-preview.png b/assets/sprites/blocks/turrets/copremite/corrosive-preview.png
diff --git a/assets/sprites/blocks/turrets/copremite/corrosive.png b/assets/sprites/blocks/turrets/copremite/corrosive.png
diff --git a/assets/sprites/blocks/turrets/copremite/toxic-preview.png b/assets/sprites/blocks/turrets/copremite/toxic-preview.png
diff --git a/assets/sprites/blocks/turrets/copremite/toxic-shoot.png b/assets/sprites/blocks/turrets/copremite/toxic-shoot.png
diff --git a/assets/sprites/blocks/turrets/copremite/toxic.png b/assets/sprites/blocks/turrets/copremite/toxic.png
diff --git a/assets/sprites/blocks/turrets/corrosive.png b/assets/sprites/blocks/turrets/corrosive.png
diff --git a/assets/sprites/blocks/turrets/granite.png b/assets/sprites/blocks/turrets/granite.png
diff --git a/assets/sprites/blocks/turrets/hammer.png b/assets/sprites/blocks/turrets/hammer.png
diff --git a/assets/sprites/blocks/turrets/mesulfate/granite-preview.png b/assets/sprites/blocks/turrets/mesulfate/granite-preview.png
diff --git a/assets/sprites/blocks/turrets/mesulfate/granite-shoot.png b/assets/sprites/blocks/turrets/mesulfate/granite-shoot.png
diff --git a/assets/sprites/blocks/turrets/mesulfate/granite-wing-l.png b/assets/sprites/blocks/turrets/mesulfate/granite-wing-l.png
diff --git a/assets/sprites/blocks/turrets/mesulfate/granite-wing-r.png b/assets/sprites/blocks/turrets/mesulfate/granite-wing-r.png
diff --git a/assets/sprites/blocks/turrets/mesulfate/granite.png b/assets/sprites/blocks/turrets/mesulfate/granite.png
diff --git a/assets/sprites/blocks/turrets/mesulfate/rain-cannon.png b/assets/sprites/blocks/turrets/mesulfate/rain-cannon.png
diff --git a/assets/sprites/blocks/turrets/mesulfate/rain-lock-l.png b/assets/sprites/blocks/turrets/mesulfate/rain-lock-l.png
diff --git a/assets/sprites/blocks/turrets/mesulfate/rain-lock-r.png b/assets/sprites/blocks/turrets/mesulfate/rain-lock-r.png
diff --git a/assets/sprites/blocks/turrets/mesulfate/rain-preview.png b/assets/sprites/blocks/turrets/mesulfate/rain-preview.png
diff --git a/assets/sprites/blocks/turrets/mesulfate/rain.png b/assets/sprites/blocks/turrets/mesulfate/rain.png
diff --git a/assets/sprites/blocks/turrets/uno.png → .../blocks/turrets/mesulfate/uno-preview.png b/assets/sprites/blocks/turrets/uno.png → .../blocks/turrets/mesulfate/uno-preview.png
diff --git a/assets/sprites/blocks/turrets/mesulfate/uno-shoot.png b/assets/sprites/blocks/turrets/mesulfate/uno-shoot.png
diff --git a/assets/sprites/blocks/turrets/mesulfate/uno.png b/assets/sprites/blocks/turrets/mesulfate/uno.png
diff --git a/assets/sprites/blocks/turrets/rain.png b/assets/sprites/blocks/turrets/rain.png
diff --git a/assets/sprites/blocks/turrets/toxic.png b/assets/sprites/blocks/turrets/toxic.png
diff --git a/build.gradle b/build.gradle
@@ -28,8 +28,8 @@ allprojects{
 }
 
 dependencies{
-    compileOnly "com.github.Anuken.Arc:arc-core:$mindustryVersion"
-    compileOnly "com.github.Anuken.Mindustry:core:$mindustryVersion"
+    compileOnly "com.github.Anuken.Arc:arc-core:dfcb21ce56"
+    compileOnly "com.github.Anuken.MindustryJitpack:core:935b478139"
     annotationProcessor "com.github.Anuken:jabel:$jabelVersion"
 }
 

diff --git a/mod.hjson b/mod.hjson
@@ -4,5 +4,5 @@ author: "Uujuju"
 main: "oblivion.ProjectOblivion"
 description: "The technology of the oblivion awaits you..."
 version: 1
-minGameVersion: 135
+minGameVersion: 136
 java: true
diff --git a/src/oblivion/blocks/defense/StatusBomb.java b/src/oblivion/blocks/defense/StatusBomb.java
@@ -39,9 +39,9 @@ public TextureRegion[] icons() {
 	@Override
 	public void setBars() {
 		super.setBars();
-		bars.add("charge", entity -> new Bar(Core.bundle.get("stat.reload"), Color.valueOf("E6875C"), () -> ((StatusBombBuild) entity).reload/cooldownTime));
-		bars.add("craftCharge", entity -> new Bar(Core.bundle.get("stat.productiontime"), Color.valueOf("FFA665"), () -> ((StatusBombBuild) entity).craftReload/craftTime));
-		bars.add("capacity", entity -> new Bar(Core.bundle.get("stat.ammo"), Pal.lancerLaser, () -> ((float) ((StatusBombBuild) entity).shots/bombCapacity)));
+		addBar("charge", entity -> new Bar(Core.bundle.get("stat.reload"), Color.valueOf("E6875C"), () -> ((StatusBombBuild) entity).reload/cooldownTime));
+		addBar("craftCharge", entity -> new Bar(Core.bundle.get("stat.productiontime"), Color.valueOf("FFA665"), () -> ((StatusBombBuild) entity).craftReload/craftTime));
+		addBar("capacity", entity -> new Bar(Core.bundle.get("stat.ammo"), Pal.lancerLaser, () -> ((float) ((StatusBombBuild) entity).shots/bombCapacity)));
 	}
 
 	@Override
@@ -69,7 +69,7 @@ public void buildConfiguration(Table table) {
 
 		@Override
 		public void updateTile() {
-			if (cons.valid() && shots < bombCapacity) {
+			if (efficiency > 0f && shots < bombCapacity) {
 				craftReload += Time.delta;
 				if (craftReload >= craftTime) {
 					craftEffect.at(x, y);

diff --git a/src/oblivion/blocks/production/ManualDrill.java b/src/oblivion/blocks/production/ManualDrill.java