Merge pull request #103 from anatawa12/RTM2.4.20

update to rtm 2.4.20
fixrtm · Jul 15, 2020 · 236a7c3 · 236a7c3
2 parents b534697 + f92a5b8
commit 236a7c3
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 509 deletions.
diff --git a/build.gradle b/build.gradle
@@ -155,8 +155,7 @@ test {
     useJUnitPlatform()
 }
 
-runClient.outputs.upToDateWhen { false }
-runServer.outputs.upToDateWhen { false }
+runClient.inputs.property("always_changed", new Date())
 
 apply from: "./processMods.gradle"
 apply from: "./makePatch.gradle"
diff --git a/important-structure/fields-RTMResource.txt b/important-structure/fields-RTMResource.txt
@@ -25,6 +25,9 @@ type: Ljp/ngt/rtm/modelpack/ResourceType;
 name: RRS
 type: Ljp/ngt/rtm/modelpack/ResourceType;
 
+name: MECHANISM
+type: Ljp/ngt/rtm/modelpack/ResourceType;
+
 name: CONNECTOR
 type: Ljp/ngt/rtm/modelpack/ResourceType;
 
@@ -121,3 +124,6 @@ type: Ljp/ngt/rtm/modelpack/ResourceType;
 name: VEHICLE_TROLLEY
 type: Ljp/ngt/rtm/modelpack/ResourceType;
 
+name: VEHICLE_LIFT
+type: Ljp/ngt/rtm/modelpack/ResourceType;
+
diff --git a/important-structure/fields-ResourceConfig/jp/ngt/rtm/block/tileentity/MechanismType.txt b/important-structure/fields-ResourceConfig/jp/ngt/rtm/block/tileentity/MechanismType.txt
@@ -0,0 +1,4 @@
+super: java/lang/Enum
+name: useRS
+type: Z
+
diff --git a/important-structure/fields-ResourceConfig/jp/ngt/rtm/modelpack/cfg/MechanismConfig.txt b/important-structure/fields-ResourceConfig/jp/ngt/rtm/modelpack/cfg/MechanismConfig.txt
@@ -0,0 +1,31 @@
+super: jp/ngt/rtm/modelpack/cfg/ModelConfig
+name: acceleration
+type: F
+
+name: maxSpeed
+type: F
+
+name: model
+type: Ljp/ngt/rtm/modelpack/cfg/ModelConfig$ModelSource;
+
+name: name
+type: Ljava/lang/String;
+
+name: radius
+type: F
+
+name: teethCount
+type: I
+
+name: transmissionRatioOFF
+type: [F
+
+name: transmissionRatioON
+type: [F
+
+name: type
+type: Ljp/ngt/rtm/block/tileentity/MechanismType;
+
+name: useRedstonePower
+type: Z
+
diff --git a/important-structure/fields-ResourceConfig/jp/ngt/rtm/modelpack/cfg/VehicleConfig.txt b/important-structure/fields-ResourceConfig/jp/ngt/rtm/modelpack/cfg/VehicleConfig.txt
@@ -11,6 +11,9 @@ type: F
 name: friction
 type: [F
 
+name: gripPos
+type: [F
+
 name: hoveringSpeed
 type: F
 

diff --git a/important-structure/fields-ResourceSet/jp/ngt/rtm/modelpack/modelset/ModelSetMechanism.txt b/important-structure/fields-ResourceSet/jp/ngt/rtm/modelpack/modelset/ModelSetMechanism.txt
@@ -0,0 +1 @@
+super: jp/ngt/rtm/modelpack/modelset/ModelSetBase