Merge pull request #292 from skiprocks999/1.21

fix bugs
aurilisdev · Jan 17, 2025 · d5fdacc · d5fdacc
2 parents ad12d4e + 4db29cc
commit d5fdacc
Show file tree

Hide file tree

Showing 130 changed files with 6,137 additions and 2,906 deletions.
diff --git a/build.gradle b/build.gradle
@@ -84,6 +84,8 @@ dependencies {
     compileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"
     compileOnly "mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}"
     localRuntime "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}"
+    compileOnly "mekanism:Mekanism:${mekanism_version}"
+    //runtimeOnly "mekanism:Mekanism:${mekanism_version}"
 
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -24,6 +24,7 @@ loader_version_range=[4,)
 
 # Dependency parameters 
 jei_version=19.21.0.246
+mekanism_version=1.21.1-10.7.0.55
 
 # Parchment parameters
 neogradle.subsystems.parchment.minecraftVersion=1.21

diff --git a/runs/client/command_history.txt b/runs/client/command_history.txt
@@ -34,3 +34,10 @@
 /time set da
 /time set day
 /gamerule doDaylightCycle false
+/time set night
+/time set mid
+/time set midnight
+/tps
+/neoforge tps
+/setblock 11 -62 -5 air
+/setblock 11 -61 -5 air
diff --git a/runs/client/defaultconfigs/electrodynamics.txt b/runs/client/defaultconfigs/electrodynamics.txt
@@ -14,6 +14,8 @@ I:default=100 -> ELECTRICFURNACE_REQUIRED_TICKS='100'
 D:default=175.0 -> ELECTRICARCFURNACE_USAGE_PER_TICK='175.0'
 I:default=50 -> ELECTRICARCFURNACE_REQUIRED_TICKS='50'
 D:default=125.0 -> WIREMILL_USAGE_PER_TICK='125.0'
+D:default=1000.0 -> ROTARY_UNIFIER_USAGE='1000.0'
+I:default=1 -> ROTARY_UNIFIER_CONVERSION_RATE='1'
 I:default=200 -> WIREMILL_REQUIRED_TICKS='200'
 D:default=350.0 -> COMBUSTIONCHAMBER_JOULES_PER_TICK='350.0'
 D:default=1000.0 -> CHARGER_USAGE_PER_TICK='1000.0'

diff --git a/runs/client/usercache.json b/runs/client/usercache.json
@@ -1 +1 @@
-[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2025-02-04 13:58:10 -0600"}]
+[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2025-02-14 16:53:57 -0600"}]
diff --git a/settings.gradle b/settings.gradle
@@ -2,24 +2,27 @@ pluginManagement {
     repositories {
         mavenLocal()
         gradlePluginPortal()
-        maven { 
-		url = 'https://maven.neoforged.net/releases' 
-	}
-	maven {
-		// location of the maven that hosts JEI files since January 2023
-		name = "Jared's maven"
-		url = "https://maven.blamejared.com/"
-  	}
-  	maven {
-		// location of a maven mirror for JEI files, as a fallback
-	    	name = "ModMaven"
-	    	url = "https://modmaven.dev"
-	}
-    	maven {
+        maven {
+            url = 'https://maven.neoforged.net/releases'
+        }
+        maven {
+            // location of the maven that hosts JEI files since January 2023
+            name = "Jared's maven"
+            url = "https://maven.blamejared.com/"
+        }
+        maven {
+            // location of a maven mirror for JEI files, as a fallback
+            name = "ModMaven"
+            url = "https://modmaven.dev"
+        }
+        maven {
             url "https://plugins.gradle.org/m2/"
         }
+		maven {
+			url "https://cursemaven.com"
+		}
     }
-    	
+
 }
 
 plugins {

diff --git a/src/generated/resources/assets/electrodynamics/blockstates/rotaryunifier.json b/src/generated/resources/assets/electrodynamics/blockstates/rotaryunifier.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "electrodynamics:block/rotaryunifier"
+    },
+    "facing=north": {
+      "model": "electrodynamics:block/rotaryunifier",
+      "y": 270
+    },
+    "facing=south": {
+      "model": "electrodynamics:block/rotaryunifier",
+      "y": 90
+    },
+    "facing=west": {
+      "model": "electrodynamics:block/rotaryunifier",
+      "y": 180
+    }
+  }
+}
diff --git a/src/generated/resources/assets/electrodynamics/lang/en_us.json b/src/generated/resources/assets/electrodynamics/lang/en_us.json
@@ -227,6 +227,7 @@
   "block.electrodynamics.resourceblocktitanium": "Block of Titanium",
   "block.electrodynamics.resourceblocktitaniumcarbide": "Block of Titanium Carbide",
   "block.electrodynamics.resourceblockvanadiumsteel": "Block of Vanadium Steel",
+  "block.electrodynamics.rotaryunifier": "Rotary Unifier",
   "block.electrodynamics.seismicmarker": "Seismic Marker",
   "block.electrodynamics.seismicrelay": "Seismic Relay",
   "block.electrodynamics.solarpanel": "Solar Panel",
@@ -476,6 +477,7 @@
   "container.potentiometer": "Potentiometer",
   "container.quarry": "Quarry",
   "container.reinforcedalloyer": "Reinforced Alloyer",
+  "container.rotaryunifier": "Rotary Unifier",
   "container.seismicrelay": "Seismic Relay",
   "container.seismicscanner": "Sonic Scanner",
   "container.solarpanel": "Solar Panel",
@@ -1428,8 +1430,6 @@
   "tooltip.electrodynamics.guidebookjeiuse": "Press 'U' for uses",
   "tooltip.electrodynamics.guidebookname": "AKA Guidebook",
   "tooltip.electrodynamics.info.broken": "NOT WORKING",
-  "tooltip.electrodynamics.info.capacityupgrade": "Multiplies Energy Capacity and Transfer by %sx",
-  "tooltip.electrodynamics.info.capacityupgradevoltage": "Will upgrade machine voltage up to %s",
   "tooltip.electrodynamics.info.cleardirs": "Shift+Left-Click to clear directions",
   "tooltip.electrodynamics.info.dirlist": "Current Directions:",
   "tooltip.electrodynamics.info.guidebooktemp": "Book Coming Soon",
@@ -1439,8 +1439,12 @@
   "tooltip.electrodynamics.info.itemoutputupgrade": "Ejects items into adjacent inventories",
   "tooltip.electrodynamics.info.nodirs": "Shift+Right-Click to add a direction",
   "tooltip.electrodynamics.info.range": "Increases raduis by 1",
-  "tooltip.electrodynamics.info.speedupgrade": "Multiplies Speed by %sx",
   "tooltip.electrodynamics.info.togglesmart": "Right-Click to toggle smart mode.",
+  "tooltip.electrodynamics.info.upgradecapacity": "Capacity: %s",
+  "tooltip.electrodynamics.info.upgradeenergytransfer": "Energy Transfer: %s",
+  "tooltip.electrodynamics.info.upgradeenergyusage": "Usage: %s",
+  "tooltip.electrodynamics.info.upgradespeed": "Speed: %s",
+  "tooltip.electrodynamics.info.upgradevoltage": "Voltage: %s",
   "tooltip.electrodynamics.info.xpstored": "Stored XP: %s",
   "tooltip.electrodynamics.info.xpusage": "Shift+Right-Click to dispense",
   "tooltip.electrodynamics.inventoryio": "Inventory I/O",
@@ -1453,9 +1457,8 @@
   "tooltip.electrodynamics.inventoryio.right": "Right",
   "tooltip.electrodynamics.inventoryio.slotmap": "Slot Map",
   "tooltip.electrodynamics.inventoryio.top": "Top",
-  "tooltip.electrodynamics.item.electric.info": "Energy Stored: %s",
-  "tooltip.electrodynamics.item.electric.voltage": "I/O Voltage: %s",
-  "tooltip.electrodynamics.itemcanister": "1000 mB",
+  "tooltip.electrodynamics.item.electric.info": "Stored: %s",
+  "tooltip.electrodynamics.item.electric.voltage": "Voltage: %s",
   "tooltip.electrodynamics.itemwire.info.fireproof": "Fire-proof",
   "tooltip.electrodynamics.itemwire.info.insulationrating": "Insulation Rating: %s",
   "tooltip.electrodynamics.itemwire.info.redstone": "Conducts Redstone",
@@ -1485,11 +1488,15 @@
   "tooltip.electrodynamics.pipematerialplastic": "Plastic",
   "tooltip.electrodynamics.pipematerialsteel": "Steel",
   "tooltip.electrodynamics.pipemaximumpressure": "Max Pressure: %s",
+  "tooltip.electrodynamics.pipethroughput": "Throughput: %s",
   "tooltip.electrodynamics.potentiometer.use": "A programmable energy void",
   "tooltip.electrodynamics.quarry.power": "Upgrades require power to work",
   "tooltip.electrodynamics.railgunmaxtemp": "Max Temp: %s",
   "tooltip.electrodynamics.railgunoverheat": "WARNING : OVERHEATING",
   "tooltip.electrodynamics.railguntemp": "Temperature %s",
+  "tooltip.electrodynamics.rotaryunifier.toggle": "Toggle Conversion",
+  "tooltip.electrodynamics.rotaryunifier.use1": "Gas must be 1 degree above",
+  "tooltip.electrodynamics.rotaryunifier.use2": "condensation temperature",
   "tooltip.electrodynamics.scannerpattern": "Sonar Pattern",
   "tooltip.electrodynamics.seismicmarker.redstone": "Apply redstone for guide lines",
   "tooltip.electrodynamics.seismicrelay.use": "Detects and stores Marker rings",
@@ -1505,6 +1512,6 @@
   "tooltip.electrodynamics.servolegs.step": "STEP",
   "tooltip.electrodynamics.tankmaxin": "In %1$s : %2$s",
   "tooltip.electrodynamics.tankmaxout": "Out %1$s : %2$s",
-  "tooltip.electrodynamics.transformer.energyloss": "Efficiency: 99.25%",
+  "tooltip.electrodynamics.transformer.energyloss": "Efficiency: %s",
   "tooltip.electrodynamics.validupgrades": "Valid Upgrades:"
 }
diff --git a/src/generated/resources/assets/electrodynamics/models/item/rotaryunifier.json b/src/generated/resources/assets/electrodynamics/models/item/rotaryunifier.json
@@ -0,0 +1,3 @@
+{
+  "parent": "electrodynamics:block/rotaryunifier"
+}
diff --git a/src/generated/resources/data/electrodynamics/loot_table/blocks/rotaryunifier.json b/src/generated/resources/data/electrodynamics/loot_table/blocks/rotaryunifier.json
@@ -0,0 +1,17 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "electrodynamics:rotaryunifier"
+        }
+      ],
+      "name": "rotaryunifier",
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "electrodynamics:blocks/rotaryunifier"
+}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2025-02-04 13:58:10 -0600"}]
		[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2025-02-14 16:53:57 -0600"}]