Merge remote-tracking branch 'origin/mc1.18/dev' into mc1.19/dev

Conflicts:
	src/main/java/com/simibubi/create/events/ClientEvents.java

.github/workflows/gradle.yml

@@ -1,26 +0,0 @@
-# This workflow will build a Java project with Gradle
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-
-name: Java CI with Gradle
-
-on:
-  push:
-    branches: [ mc1.15/dev ]
-  pull_request:
-    branches: [ mc1.15/dev ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Build with Gradle
-      run: ./gradlew build

README.md

@@ -9,8 +9,8 @@
     <br><br>
 </h1>
 
-<p>Welcome to Create, a mod offering a variety of tools and blocks for Building, Decoration and Aesthetic Automation.</p>
-<p>The added elements of tech are designed to leave as many design choices to the player as possible. With Create, the game isn't played inside a bunch of UIs, it challenges you to setup contraptions of animated components working together in many possible arrangements.</p>
+<p>Welcome to Create, a mod offering a variety of tools and blocks for Building, Decoration, and Aesthetic Automation.</p>
+<p>The added elements of tech are designed to leave as many design choices to the player as possible. With Create, the game isn't played inside a bunch of UIs, it challenges you to set up contraptions of animated components working together in many possible arrangements.</p>
 <p>Create's visual in-game documentation called 'Ponder' will guide you through all added mechanics and gadgets.</p>
 <p>&nbsp;</p>
 <p align="center"><a href="https://github.com/Creators-of-Create/Create/issues"><img src="https://i.imgur.com/qPmjSXy.png" width="160" /></a> <a href="https://www.youtube.com/channel/UCrKV2QTuyGcv4E3eSJpBiYA/playlists"><img src="https://i.imgur.com/L1bU9mr.png" width="160" /></a><a href="https://discord.gg/hmaD7Se"><img src="https://i.imgur.com/uf6V9ZX.png" width="160" /></a> <a href="https://github.com/Creators-of-Create/Create/wiki/Supporting-the-Project"><img src="https://i.imgur.com/fHQ45KR.png" width="227" /></a></p>

src/generated/resources/.cache/cache

@@ -5359,7 +5359,7 @@ f6e2fb5725f3730d01fae4a2b1a04d11095eab5f data/create/recipes/scorchia_pillar_fro
 66e8559dc15ce13042bd007247e2851022362b9e data/create/recipes/scorchia_pillar_from_stone_types_scorchia_stonecutting.json
 2e0ecbd3619f080d0fc6fe48307c5a5bcc2e91b4 data/create/recipes/scoria_pillar_from_scoria_stonecutting.json
 d6e16599de7424513e1457b07acb6370815d2bd7 data/create/recipes/scoria_pillar_from_stone_types_scoria_stonecutting.json
-b49a0da57a179edc087eee224221ded22fd1be01 data/create/recipes/sequenced_assembly/precision_mechanism.json
+b3fad45a09a05b285de31283a720b32e6fc63dc6 data/create/recipes/sequenced_assembly/precision_mechanism.json
 de17d82738a5e0242eb3109fd2a75337160fc843 data/create/recipes/sequenced_assembly/sturdy_sheet.json
 7610e0be633b1ade7ae39db3dbbfe1bd14aa333a data/create/recipes/sequenced_assembly/track.json
 5e7648d55555c263539a2696b8d1f8d352a71dc9 data/create/recipes/small_andesite_brick_slab.json
@@ -5702,7 +5702,7 @@ cc82188fe8d986f4457301ed4f75ae833d263601 data/forge/tags/items/nuggets/brass.jso
 6eec92869baa44d3ac53aec6a7a92c15147b59f0 data/forge/tags/items/ores/zinc.json
 9fc688d8fac1033c7b8f4b8de1138e56d2faf527 data/forge/tags/items/ores_in_ground/deepslate.json
 d5ea262a0f5fb210612d22521818e26cf08e591a data/forge/tags/items/ores_in_ground/stone.json
-5d5ec04a61ff2b1ad19210e2859a9c96cc246ef8 data/forge/tags/items/plates.json
+e32b78851bc4fce0745d8b72c85cbd4e89e8c221 data/forge/tags/items/plates.json
 39f0d70ec10597e85df7c4783bbc5e0e4a5ffb80 data/forge/tags/items/plates/brass.json
 c3dab5fe379bc1b7b10d4a0ba7009eee1b75a27c data/forge/tags/items/plates/copper.json
 fb9bfb4c84ed9cf2da8c4b2fbc4cd4d9f37d3016 data/forge/tags/items/plates/gold.json

src/generated/resources/data/create/recipes/sequenced_assembly/precision_mechanism.json

@@ -73,6 +73,10 @@
       "item": "create:cogwheel",
       "chance": 5.0
     },
+    {
+      "item": "minecraft:gold_nugget",
+      "chance": 3.0
+    },
     {
       "item": "create:shaft",
       "chance": 2.0
@@ -81,10 +85,6 @@
       "item": "create:crushed_gold_ore",
       "chance": 2.0
     },
-    {
-      "item": "minecraft:gold_nugget",
-      "chance": 2.0
-    },
     {
       "item": "minecraft:iron_ingot"
     },

src/generated/resources/data/forge/tags/items/plates.json

@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
+    "create:sturdy_sheet",
     "create:copper_sheet",
     "create:brass_sheet",
     "create:iron_sheet",

src/main/java/com/simibubi/create/AllItems.java

@@ -85,7 +85,7 @@ public class AllItems {
 		DOUGH = taggedIngredient("dough", forgeItemTag("dough"), forgeItemTag("dough/wheat")),
 		CINDER_FLOUR = ingredient("cinder_flour"), ROSE_QUARTZ = ingredient("rose_quartz"),
 		POLISHED_ROSE_QUARTZ = ingredient("polished_rose_quartz"), POWDERED_OBSIDIAN = ingredient("powdered_obsidian"),
-		STURDY_SHEET = taggedIngredient("sturdy_sheet", forgeItemTag("plates/obsidian")),
+		STURDY_SHEET = taggedIngredient("sturdy_sheet", forgeItemTag("plates/obsidian"), PLATES.tag),
 		PROPELLER = ingredient("propeller"), WHISK = ingredient("whisk"), BRASS_HAND = ingredient("brass_hand"),
 		CRAFTER_SLOT_COVER = ingredient("crafter_slot_cover"), ELECTRON_TUBE = ingredient("electron_tube");
 

src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java

@@ -57,8 +57,7 @@ public class SequencedAssemblyCategory extends CreateRecipeCategory<SequencedAss
 						return;
 
 					float chance = recipe.getOutputChance();
-					tooltip.add(1, Lang.translateDirect("recipe.processing.chance", chance < 0.01 ? "<1" : (int) (chance * 100))
-							.withStyle(ChatFormatting.GOLD));
+					tooltip.add(1, chanceComponent(chance));
 				});
 
 		int width = 0;
@@ -157,8 +156,7 @@ public class SequencedAssemblyCategory extends CreateRecipeCategory<SequencedAss
 		if (!singleOutput && mouseX >= minX && mouseX < maxX && mouseY >= minY && mouseY < maxY) {
 			float chance = recipe.getOutputChance();
 			tooltip.add(junk);
-			tooltip.add(Lang.translateDirect("recipe.processing.chance", chance < 0.01 ? "<1" : 100 - (int) (chance * 100))
-				.withStyle(ChatFormatting.GOLD));
+			tooltip.add(chanceComponent(1 - chance));
 			return tooltip;
 		}
 
@@ -198,4 +196,10 @@ public class SequencedAssemblyCategory extends CreateRecipeCategory<SequencedAss
 
 		return tooltip;
 	}
+
+	protected MutableComponent chanceComponent(float chance) {
+		String number = chance < 0.01 ? "<1" : chance > 0.99 ? ">99" : String.valueOf(Math.round(chance * 100));
+		return Lang.translateDirect("recipe.processing.chance", number)
+			.withStyle(ChatFormatting.GOLD);
+	}
 }

src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxHandlerClient.java

@@ -157,7 +157,7 @@ public class ToolboxHandlerClient {
 
 	public static void renderOverlay(ForgeGui gui, PoseStack poseStack, float partialTicks, int width, int height) {
 		Minecraft mc = Minecraft.getInstance();
-		if (mc.options.hideGui)
+		if (mc.options.hideGui || mc.gameMode.getPlayerMode() == GameType.SPECTATOR)
 			return;
 
 		int x = width / 2 - 90;

src/main/java/com/simibubi/create/events/ClientEvents.java

@@ -87,7 +87,6 @@ import net.minecraftforge.client.event.ClientPlayerNetworkEvent;
 import net.minecraftforge.client.event.EntityRenderersEvent;
 import net.minecraftforge.client.event.RegisterClientReloadListenersEvent;
 import net.minecraftforge.client.event.RegisterGuiOverlaysEvent;
-import net.minecraftforge.client.event.RenderHighlightEvent;
 import net.minecraftforge.client.event.RenderLevelLastEvent;
 import net.minecraftforge.client.event.RenderTooltipEvent;
 import net.minecraftforge.client.event.ViewportEvent;
@@ -176,9 +175,6 @@ public class ClientEvents {
 		TrainHUD.tick();
 	}
 
-	@SubscribeEvent
-	public static void onRenderSelection(RenderHighlightEvent.Block event) {}
-
 	@SubscribeEvent
 	public static void onJoin(ClientPlayerNetworkEvent.LoggingIn event) {
 		CreateClient.checkGraphicsFanciness();

src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java

@@ -41,9 +41,9 @@ public class SequencedAssemblyRecipeGen extends CreateRecipeProvider {
 		.addOutput(AllItems.GOLDEN_SHEET.get(), 8)
 		.addOutput(AllItems.ANDESITE_ALLOY.get(), 8)
 		.addOutput(AllBlocks.COGWHEEL.get(), 5)
+		.addOutput(Items.GOLD_NUGGET, 3)
 		.addOutput(AllBlocks.SHAFT.get(), 2)
 		.addOutput(AllItems.CRUSHED_GOLD.get(), 2)
-		.addOutput(Items.GOLD_NUGGET, 2)
 		.addOutput(Items.IRON_INGOT, 1)
 		.addOutput(Items.CLOCK, 1)
 		.loops(5)