From da5f408e3542e3a85416b129f2b40d1ff910181f Mon Sep 17 00:00:00 2001
From: TheBlackfurGuy <64478051+TheBlackfurGuy@users.noreply.github.com>
Date: Fri, 3 Dec 2021 20:08:31 +0100
Subject: [PATCH] Upgraded to 1.18
---
.idea/compiler.xml | 2 +-
.idea/gradle.xml | 1 +
.idea/misc.xml | 2 +-
.idea/runConfigurations.xml | 10 -
.idea/workspace.xml | 202 +++++++++++++-----
.../loot_tables/blocks/toasters.json | 0
.../tags/blocks/mineable/pickaxe.json | 0
.../tags/blocks/needs_stone_tool.json | 0
build.gradle | 4 +-
gradle.properties | 8 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
.../blackfur/tastytoasters/Tastytoasters.java | 10 +
.../tastytoasters/block/ToasterBlock.java | 9 +
.../tastytoasters/models/block/toaster.json | 53 ++++-
src/main/resources/fabric.mod.json | 2 +-
src/main/resources/tastytoasters.mixins.json | 2 +-
16 files changed, 227 insertions(+), 80 deletions(-)
delete mode 100644 .idea/runConfigurations.xml
rename {src/main/resources/data/tastytoasters => Temp}/loot_tables/blocks/toasters.json (100%)
rename {src/main/resources/data => Temp}/minecraft/tags/blocks/mineable/pickaxe.json (100%)
rename {src/main/resources/data => Temp}/minecraft/tags/blocks/needs_stone_tool.json (100%)
create mode 100644 src/main/java/blackfur/tastytoasters/block/ToasterBlock.java
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 659bf43..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ba1ec5c..611e7c8 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -66,17 +35,150 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/data/tastytoasters/loot_tables/blocks/toasters.json b/Temp/loot_tables/blocks/toasters.json
similarity index 100%
rename from src/main/resources/data/tastytoasters/loot_tables/blocks/toasters.json
rename to Temp/loot_tables/blocks/toasters.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/Temp/minecraft/tags/blocks/mineable/pickaxe.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
rename to Temp/minecraft/tags/blocks/mineable/pickaxe.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/Temp/minecraft/tags/blocks/needs_stone_tool.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json
rename to Temp/minecraft/tags/blocks/needs_stone_tool.json
diff --git a/build.gradle b/build.gradle
index f521b44..59806e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'fabric-loom' version '0.9.50'
+ id 'fabric-loom' version '0.10-SNAPSHOT'
id 'maven-publish'
}
@@ -36,7 +36,7 @@ processResources {
}
}
-def targetJavaVersion = 16
+def targetJavaVersion = 17
tasks.withType(JavaCompile).configureEach {
// ensure that the encoding is set to UTF-8, no matter what the system default is
// this fixes some edge cases with special characters not displaying correctly
diff --git a/gradle.properties b/gradle.properties
index bcb7cc4..05e6b07 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,13 +2,13 @@
org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://modmuss50.me/fabric.html
-minecraft_version=1.17.1
-yarn_mappings=1.17.1+build.61
-loader_version=0.11.6
+minecraft_version=1.18
+yarn_mappings=1.18+build.1
+loader_version=0.12.8
# Mod Properties
mod_version=1.0-SNAPSHOT
maven_group=blackfur
archives_base_name=tastytoasters
# Dependencies
# check this on https://modmuss50.me/fabric.html
-fabric_version=0.40.1+1.17
+fabric_version=0.44.0+1.18
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 05679dc..e750102 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/src/main/java/blackfur/tastytoasters/Tastytoasters.java b/src/main/java/blackfur/tastytoasters/Tastytoasters.java
index 8834770..ecde1cc 100644
--- a/src/main/java/blackfur/tastytoasters/Tastytoasters.java
+++ b/src/main/java/blackfur/tastytoasters/Tastytoasters.java
@@ -1,8 +1,13 @@
package blackfur.tastytoasters;
+import blackfur.tastytoasters.block.ToasterBlock;
import blackfur.tastytoasters.items.*;
import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.minecraft.block.Material;
+import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
+import net.minecraft.item.ItemGroup;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
@@ -13,6 +18,8 @@ public class Tastytoasters implements ModInitializer {
public static final Item BURNT_TOAST_ITEM = new BurntToastItem();
public static final Item BUTTER_ITEM = new ButterItem();
public static final Item BUTTERED_TOAST_ITEM = new ButteredToastItem();
+
+ public static final ToasterBlock TOASTER_BLOCK = new ToasterBlock(FabricBlockSettings.of(Material.METAL).hardness(4.0f));
@Override
public void onInitialize() {
@@ -21,5 +28,8 @@ public class Tastytoasters implements ModInitializer {
Registry.register(Registry.ITEM, new Identifier("tastytoasters", "burnt_toast"), BURNT_TOAST_ITEM);
Registry.register(Registry.ITEM, new Identifier("tastytoasters", "butter"), BUTTER_ITEM);
Registry.register(Registry.ITEM, new Identifier("tastytoasters", "buttered_toast"), BUTTERED_TOAST_ITEM);
+
+ Registry.register(Registry.BLOCK, new Identifier("tastytoasters", "toaster"), TOASTER_BLOCK);
+ Registry.register(Registry.ITEM, new Identifier("tastytoasters", "toaster"), new BlockItem(TOASTER_BLOCK, new Item.Settings().group(ItemGroup.FOOD)));
}
}
diff --git a/src/main/java/blackfur/tastytoasters/block/ToasterBlock.java b/src/main/java/blackfur/tastytoasters/block/ToasterBlock.java
new file mode 100644
index 0000000..a50f802
--- /dev/null
+++ b/src/main/java/blackfur/tastytoasters/block/ToasterBlock.java
@@ -0,0 +1,9 @@
+package blackfur.tastytoasters.block;
+
+import net.minecraft.block.Block;
+
+public class ToasterBlock extends Block {
+ public ToasterBlock(Settings settings) {
+ super(settings);
+ }
+}
diff --git a/src/main/resources/assets/tastytoasters/models/block/toaster.json b/src/main/resources/assets/tastytoasters/models/block/toaster.json
index 4513b96..7e070ed 100644
--- a/src/main/resources/assets/tastytoasters/models/block/toaster.json
+++ b/src/main/resources/assets/tastytoasters/models/block/toaster.json
@@ -1,21 +1,56 @@
{
"credit": "Made with Blockbench",
- "texture_size": [32, 32],
"textures": {
- "1": "tastytoasters:block/toaster"
+ "0": "tastytoasters:block/toaster",
+ "particle": "tastytoasters:block/toaster"
},
"elements": [
{
"from": [3, 0, 1],
"to": [13, 8, 15],
"faces": {
- "north": {"uv": [0, 0, 5, 4], "texture": "#1"},
- "east": {"uv": [10, 4, 14, 11], "rotation": 270, "texture": "#1"},
- "south": {"uv": [5, 0, 10, 4], "texture": "#1"},
- "west": {"uv": [14, 4, 10, 11], "rotation": 90, "texture": "#1"},
- "up": {"uv": [0, 4, 5, 11], "texture": "#1"},
- "down": {"uv": [5, 4, 10, 11], "texture": "#1"}
+ "north": {"uv": [0, 0, 5, 4], "texture": "#0"},
+ "east": {"uv": [10, 4, 14, 11], "rotation": 270, "texture": "#0"},
+ "south": {"uv": [5, 0, 10, 4], "texture": "#0"},
+ "west": {"uv": [10, 4, 14, 11], "rotation": 270, "texture": "#0"},
+ "up": {"uv": [0, 4, 5, 11], "texture": "#0"},
+ "down": {"uv": [5, 4, 10, 11], "texture": "#0"}
}
}
- ]
+ ],
+ "display": {
+ "thirdperson_righthand": {
+ "rotation": [75, 45, 0],
+ "translation": [0, 2.5, 0],
+ "scale": [0.375, 0.375, 0.375]
+ },
+ "thirdperson_lefthand": {
+ "rotation": [75, 45, 0],
+ "translation": [0, 2.5, 0],
+ "scale": [0.375, 0.375, 0.375]
+ },
+ "firstperson_righthand": {
+ "rotation": [0, 45, 0],
+ "scale": [0.4, 0.4, 0.4]
+ },
+ "firstperson_lefthand": {
+ "rotation": [0, 225, 0],
+ "scale": [0.4, 0.4, 0.4]
+ },
+ "ground": {
+ "translation": [0, 3, 0],
+ "scale": [0.25, 0.25, 0.25]
+ },
+ "gui": {
+ "rotation": [30, 225, 0],
+ "scale": [0.625, 0.625, 0.625]
+ },
+ "head": {
+ "rotation": [0, 180, 0],
+ "translation": [0, 13, 7]
+ },
+ "fixed": {
+ "scale": [0.5, 0.5, 0.5]
+ }
+ }
}
\ No newline at end of file
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index d8e45bf..80207ac 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -23,6 +23,6 @@
"depends": {
"fabricloader": ">=0.11.6",
"fabric": "*",
- "minecraft": "1.17.1"
+ "minecraft": "1.18.x"
}
}
diff --git a/src/main/resources/tastytoasters.mixins.json b/src/main/resources/tastytoasters.mixins.json
index 0f71de9..b0b16da 100644
--- a/src/main/resources/tastytoasters.mixins.json
+++ b/src/main/resources/tastytoasters.mixins.json
@@ -2,7 +2,7 @@
"required": true,
"minVersion": "0.8",
"package": "blackfur.tastytoasters.mixin",
- "compatibilityLevel": "JAVA_16",
+ "compatibilityLevel": "JAVA_17",
"mixins": [
],
"client": [