Potato PC Version

british-transport-addon · Jun 29, 2024 · 7d95dff · 7d95dff
1 parent dcd469c
commit 7d95dff
Show file tree

Hide file tree

Showing 102 changed files with 72 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,23 +39,43 @@ jobs:
         with:
           name: Fabric and Forge ${{ matrix.minecraft }}
           path: build/release/
-  crowdin:
+  potato:
+    strategy:
+      fail-fast: false
+      matrix:
+        minecraft: [ 1.16.5, 1.17.1, 1.18.2, 1.19.2, 1.19.4, 1.20.1, 1.20.4 ]
+
     runs-on: ubuntu-latest
-    permissions: write-all
     steps:
       - name: Checkout repository
         uses: actions/checkout@main
-      - name: Upload Translations to Crowdin
-        env:
-          MY_KEY: ${{ secrets.CROWDIN_API_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        uses: crowdin/github-action@master
+
+      - name: Validate gradle wrapper
+        uses: gradle/actions/wrapper-validation@main
+
+      - name: Setup JDK 17
+        uses: actions/setup-java@main
+        with:
+          java-version: 17
+          distribution: 'zulu'
+
+      - name: Make gradle wrapper executable
+        run: chmod +x ./gradlew
+
+      - name: Setup Fabric files
+        run: ./gradlew fabric:setupFiles -PminecraftVersion="${{ matrix.minecraft }}"
+
+      - name: Setup Potato PC Textures
+        run: ./gradlew fabric:setupPotato -PminecraftVersion="${{ matrix.minecraft }}"
+
+      - name: Setup Forge files
+        run: ./gradlew forge:setupFiles -PminecraftVersion="${{ matrix.minecraft }}"
+
+      - name: Build ${{ matrix.minecraft }}
+        run: ./gradlew build -PminecraftVersion="${{ matrix.minecraft }}"
+
+      - name: Capture release artifacts
+        uses: actions/upload-artifact@main
         with:
-          upload_sources: true
-          upload_translations: false
-          download_translations: true
-          push_translations: true
-          create_pull_request: true
-          project_id: '685566'
-          token: ${{ secrets.CROWDIN_API_KEY }}
-          config: 'crowdin.yml'
+          name: Fabric and Forge ${{ matrix.minecraft }} Potato PC Version
+          path: build/release/
diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml
@@ -0,0 +1,25 @@
+name: Crowdin
+on: push
+
+jobs:
+    crowdin:
+        runs-on: ubuntu-latest
+        permissions: write-all
+        if: github.ref == 'refs/heads/main'
+        steps:
+        - name: Checkout repository
+            uses: actions/checkout@main
+        - name: Upload Translations to Crowdin
+            env:
+            MY_KEY: ${{ secrets.CROWDIN_API_KEY }}
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            uses: crowdin/github-action@master
+            with:
+            upload_sources: true
+            upload_translations: false
+            download_translations: true
+            push_translations: true
+            create_pull_request: true
+            project_id: '685566'
+            token: ${{ secrets.CROWDIN_API_KEY }}
+            config: 'crowdin.yml'
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -37,6 +37,16 @@ tasks.register("setupFiles") {
     }
 }
 
+tasks.register("setupPotato") {
+	delete fileTree("src/main/resources/assets/jta/textures")
+
+	copy {
+		outputs.upToDateWhen { true }
+		from "../potatoTex"
+		into "src/main/resources/assets/jta/textures"
+	}
+}
+
 build {
     doLast {
         buildTools.copyBuildFile()

diff --git a/fabric/src/main/resources/assets/jta/models/block/british_trash_bin.json b/fabric/src/main/resources/assets/jta/models/block/british_trash_bin.json
@@ -3,7 +3,7 @@
   "textures": {
     "1": "jta:block/british_trash_bin/base",
     "2": "jta:block/british_trash_bin/bee",
-    "3": "jta:block/british_trash_bin/iron_trapdoor",
+    "3": "minecraft:block/iron_trapdoor",
     "4": "jta:block/british_trash_bin/basefood",
     "5": "jta:block/british_trash_bin/cig"
   },

diff --git a/fabric/src/main/resources/assets/jta/models/block/british_trash_bin_alt.json b/fabric/src/main/resources/assets/jta/models/block/british_trash_bin_alt.json
@@ -3,7 +3,7 @@
   "textures": {
     "1": "jta:block/british_trash_bin/base",
     "2": "jta:block/british_trash_bin/bee",
-    "3": "jta:block/british_trash_bin/iron_trapdoor",
+    "3": "minecraft:block/iron_trapdoor",
     "4": "jta:block/british_trash_bin/basefood",
     "5": "jta:block/british_trash_bin/cig"
   },

diff --git a/...rc/main/resources/assets/jta/textures/block/british_trash_bin/iron_trapdoor.png b/...rc/main/resources/assets/jta/textures/block/british_trash_bin/iron_trapdoor.png
diff --git a/potatoTex/block/2001_being_careful_wont_hurt_you.png b/potatoTex/block/2001_being_careful_wont_hurt_you.png
diff --git a/potatoTex/block/24_hour_cctv_in_operation.png b/potatoTex/block/24_hour_cctv_in_operation.png
diff --git a/potatoTex/block/24hourcctv.png b/potatoTex/block/24hourcctv.png
diff --git a/potatoTex/block/ahead_only.png b/potatoTex/block/ahead_only.png
diff --git a/potatoTex/block/are_they_avoiding_police_or_staff.png b/potatoTex/block/are_they_avoiding_police_or_staff.png
diff --git a/potatoTex/block/avanti_west_coast_sign.png b/potatoTex/block/avanti_west_coast_sign.png
diff --git a/potatoTex/block/be_careful.png b/potatoTex/block/be_careful.png
diff --git a/potatoTex/block/british_rail.png b/potatoTex/block/british_rail.png
diff --git a/potatoTex/block/british_rail_platforms/dont_pass_the_yellow_line.png b/potatoTex/block/british_rail_platforms/dont_pass_the_yellow_line.png
diff --git a/potatoTex/block/british_rail_platforms/platform.png b/potatoTex/block/british_rail_platforms/platform.png
diff --git a/potatoTex/block/british_rail_platforms/platform_edge.png b/potatoTex/block/british_rail_platforms/platform_edge.png
diff --git a/potatoTex/block/british_rail_platforms/platform_variant.png b/potatoTex/block/british_rail_platforms/platform_variant.png
diff --git a/potatoTex/block/british_rail_platforms/tactile_pavement.png b/potatoTex/block/british_rail_platforms/tactile_pavement.png
diff --git a/potatoTex/block/british_railway_grout.png b/potatoTex/block/british_railway_grout.png
diff --git a/potatoTex/block/british_trash_bin/base.png b/potatoTex/block/british_trash_bin/base.png
diff --git a/potatoTex/block/british_trash_bin/basefood.png b/potatoTex/block/british_trash_bin/basefood.png
diff --git a/potatoTex/block/british_trash_bin/bee.png b/potatoTex/block/british_trash_bin/bee.png
diff --git a/potatoTex/block/british_trash_bin/cig.png b/potatoTex/block/british_trash_bin/cig.png
diff --git a/potatoTex/block/british_trash_bin/cig2.png b/potatoTex/block/british_trash_bin/cig2.png
diff --git a/potatoTex/block/caution_no_hurt.png b/potatoTex/block/caution_no_hurt.png
diff --git a/potatoTex/block/cctv_in_operation.png b/potatoTex/block/cctv_in_operation.png
diff --git a/potatoTex/block/contactless.png b/potatoTex/block/contactless.png
diff --git a/potatoTex/block/danger_electric_shock.png b/potatoTex/block/danger_electric_shock.png
diff --git a/potatoTex/block/danger_high_voltage.png b/potatoTex/block/danger_high_voltage.png
diff --git a/potatoTex/block/do_not_cross.png b/potatoTex/block/do_not_cross.png
diff --git a/potatoTex/block/do_not_trespass.png b/potatoTex/block/do_not_trespass.png
diff --git a/potatoTex/block/emr_sign.png b/potatoTex/block/emr_sign.png
diff --git a/potatoTex/block/emr_ticket_machine/block.png b/potatoTex/block/emr_ticket_machine/block.png
diff --git a/potatoTex/block/emr_ticket_machine/ticket.png b/potatoTex/block/emr_ticket_machine/ticket.png
diff --git a/potatoTex/block/emr_ticket_machine/ticketscreen.png b/potatoTex/block/emr_ticket_machine/ticketscreen.png
diff --git a/potatoTex/block/explore_less.png b/potatoTex/block/explore_less.png
diff --git a/potatoTex/block/fly_the_tube.png b/potatoTex/block/fly_the_tube.png
diff --git a/potatoTex/block/free_the_night.png b/potatoTex/block/free_the_night.png
diff --git a/potatoTex/block/going_to_heathrow.png b/potatoTex/block/going_to_heathrow.png
diff --git a/potatoTex/block/gray_plastic.png b/potatoTex/block/gray_plastic.png
diff --git a/potatoTex/block/greek_platform_end.png b/potatoTex/block/greek_platform_end.png
diff --git a/potatoTex/block/lane_control_cross_green_arrow.png b/potatoTex/block/lane_control_cross_green_arrow.png
diff --git a/potatoTex/block/lane_control_cross_red_arrow.png b/potatoTex/block/lane_control_cross_red_arrow.png
diff --git a/potatoTex/block/lane_control_empty.png b/potatoTex/block/lane_control_empty.png
diff --git a/potatoTex/block/left_bag_unattended.png b/potatoTex/block/left_bag_unattended.png
diff --git a/potatoTex/block/level_crossing.png b/potatoTex/block/level_crossing.png
diff --git a/potatoTex/block/lime_bricks.png b/potatoTex/block/lime_bricks.png
diff --git a/potatoTex/block/merseyrail_sign.png b/potatoTex/block/merseyrail_sign.png
diff --git a/potatoTex/block/metrolink_contactless_reader/bee.png b/potatoTex/block/metrolink_contactless_reader/bee.png
diff --git a/potatoTex/block/metrolink_contactless_reader/paint.png b/potatoTex/block/metrolink_contactless_reader/paint.png
diff --git a/potatoTex/block/metrolink_contactless_reader/paint2.png b/potatoTex/block/metrolink_contactless_reader/paint2.png
diff --git a/potatoTex/block/metrolink_contactless_reader/stickertouch.png b/potatoTex/block/metrolink_contactless_reader/stickertouch.png
diff --git a/potatoTex/block/metrolink_ticket_machine/block.png b/potatoTex/block/metrolink_ticket_machine/block.png
diff --git a/potatoTex/block/metrolink_ticket_machine/ticket.png b/potatoTex/block/metrolink_ticket_machine/ticket.png
diff --git a/potatoTex/block/metrolink_ticket_machine/ticketscreen.png b/potatoTex/block/metrolink_ticket_machine/ticketscreen.png
diff --git a/potatoTex/block/night_tube_info.png b/potatoTex/block/night_tube_info.png
diff --git a/potatoTex/block/no-entry.png b/potatoTex/block/no-entry.png
diff --git a/potatoTex/block/no_access.png b/potatoTex/block/no_access.png
diff --git a/potatoTex/block/no_littering.png b/potatoTex/block/no_littering.png
diff --git a/potatoTex/block/no_parking.png b/potatoTex/block/no_parking.png
diff --git a/potatoTex/block/no_pavement_parking.png b/potatoTex/block/no_pavement_parking.png
diff --git a/potatoTex/block/no_sitting.png b/potatoTex/block/no_sitting.png
diff --git a/potatoTex/block/northern_sign.png b/potatoTex/block/northern_sign.png
diff --git a/potatoTex/block/northern_ticket_machine/block.png b/potatoTex/block/northern_ticket_machine/block.png
diff --git a/potatoTex/block/northern_ticket_machine/ticket.png b/potatoTex/block/northern_ticket_machine/ticket.png
diff --git a/potatoTex/block/northern_ticket_machine/ticketscreen.png b/potatoTex/block/northern_ticket_machine/ticketscreen.png
diff --git a/potatoTex/block/nosmokingvaping.png b/potatoTex/block/nosmokingvaping.png
diff --git a/potatoTex/block/only.png b/potatoTex/block/only.png
diff --git a/potatoTex/block/penalty_fare.png b/potatoTex/block/penalty_fare.png
diff --git a/potatoTex/block/permissible_speed_30.png b/potatoTex/block/permissible_speed_30.png
diff --git a/potatoTex/block/permissible_speed_40.png b/potatoTex/block/permissible_speed_40.png
diff --git a/potatoTex/block/permissible_speed_50.png b/potatoTex/block/permissible_speed_50.png
diff --git a/potatoTex/block/play_fare.png b/potatoTex/block/play_fare.png
diff --git a/potatoTex/block/poster_somewhere_shouldnt.png b/potatoTex/block/poster_somewhere_shouldnt.png
diff --git a/potatoTex/block/reduce_speed_now.png b/potatoTex/block/reduce_speed_now.png
diff --git a/potatoTex/block/residents_parking_only.png b/potatoTex/block/residents_parking_only.png
diff --git a/potatoTex/block/rusty_pole.png b/potatoTex/block/rusty_pole.png
diff --git a/potatoTex/block/speed_10.png b/potatoTex/block/speed_10.png
diff --git a/potatoTex/block/speed_15.png b/potatoTex/block/speed_15.png
diff --git a/potatoTex/block/speed_20.png b/potatoTex/block/speed_20.png
diff --git a/potatoTex/block/speed_20_zone.png b/potatoTex/block/speed_20_zone.png
diff --git a/potatoTex/block/speed_30.png b/potatoTex/block/speed_30.png
diff --git a/potatoTex/block/speed_40.png b/potatoTex/block/speed_40.png
diff --git a/potatoTex/block/speed_5.png b/potatoTex/block/speed_5.png
diff --git a/potatoTex/block/speed_50.png b/potatoTex/block/speed_50.png
diff --git a/potatoTex/block/speed_60.png b/potatoTex/block/speed_60.png
diff --git a/potatoTex/block/speed_70.png b/potatoTex/block/speed_70.png
diff --git a/potatoTex/block/standcleardoors.png b/potatoTex/block/standcleardoors.png
diff --git a/potatoTex/block/steel.png b/potatoTex/block/steel.png
diff --git a/potatoTex/block/stop.png b/potatoTex/block/stop.png
diff --git a/potatoTex/block/stop_look_listen.png b/potatoTex/block/stop_look_listen.png
diff --git a/potatoTex/block/train_crossing.png b/potatoTex/block/train_crossing.png
diff --git a/potatoTex/block/tram.png b/potatoTex/block/tram.png
diff --git a/potatoTex/block/tram_crossing.png b/potatoTex/block/tram_crossing.png
diff --git a/potatoTex/block/tramway.png b/potatoTex/block/tramway.png
diff --git a/potatoTex/block/turn_left.png b/potatoTex/block/turn_left.png
diff --git a/potatoTex/block/turn_left_ahead.png b/potatoTex/block/turn_left_ahead.png
diff --git a/potatoTex/block/turn_right.png b/potatoTex/block/turn_right.png
diff --git a/potatoTex/block/turn_right_ahead.png b/potatoTex/block/turn_right_ahead.png
diff --git a/potatoTex/block/use_caution.png b/potatoTex/block/use_caution.png
diff --git a/potatoTex/block/yellow.png b/potatoTex/block/yellow.png