Skip to content

Commit

Permalink
add gas conversion and patch some issues
Browse files Browse the repository at this point in the history
  • Loading branch information
skiprocks999 committed Jan 11, 2025
1 parent be4fb4d commit 69349af
Show file tree
Hide file tree
Showing 46 changed files with 3,091 additions and 486 deletions.
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

}

Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions runs/client/command_history.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@
/time set da
/time set day
/gamerule doDaylightCycle false
/time set night
/time set mid
/time set midnight
2 changes: 2 additions & 0 deletions runs/client/defaultconfigs/electrodynamics.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion runs/client/usercache.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2025-02-05 11:06:07 -0600"}]
[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2025-02-10 20:26:01 -0600"}]
33 changes: 18 additions & 15 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -1490,6 +1492,9 @@
"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",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "electrodynamics:block/rotaryunifier"
}
Original file line number Diff line number Diff line change
@@ -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"
}
Loading

0 comments on commit 69349af

Please sign in to comment.