QuImUfu/simple-creator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to 1.21

Browse Source
This commit is contained in:
QuImUfu 2024-07-11 23:38:19 +02:00
parent f6c2ea900c
commit 332b3df632
11 changed files with 317 additions and 550 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
blockPropertyDocumentation.txt
View File

@ -20,9 +20,10 @@
nether_ore, bone, netherite, ancient_debris, lodestone, chain, nether_ore, bone, netherite, ancient_debris, lodestone, chain,
nether_gold_ore, gilded_blackstone, candle, amethyst_block, nether_gold_ore, gilded_blackstone, candle, amethyst_block,
amethyst_cluster, small_amethyst_bud, medium_amethyst_bud, amethyst_cluster, small_amethyst_bud, medium_amethyst_bud,
large_amethyst_bud, tuff, calcite, dripstone_block, large_amethyst_bud, tuff, tuff_bricks, polished_tuff, calcite,
pointed_dripstone, copper, cave_vines, spore_blossom, azalea, dripstone_block, pointed_dripstone, copper, copper_bulb,
flowering_azalea, moss_carpet, pink_petals, moss_block, big_dripleaf, copper_grate, cave_vines, spore_blossom, azalea, flowering_azalea,
moss_carpet, pink_petals, moss_block, big_dripleaf,
small_dripleaf, rooted_dirt, hanging_roots, azalea_leaves, small_dripleaf, rooted_dirt, hanging_roots, azalea_leaves,
sculk_sensor, sculk_catalyst, sculk, sculk_vein, sculk_shrieker, sculk_sensor, sculk_catalyst, sculk, sculk_vein, sculk_shrieker,
glow_lichen, deepslate, deepslate_bricks, deepslate_tiles, glow_lichen, deepslate, deepslate_bricks, deepslate_tiles,
@ -31,7 +32,9 @@
nether_wood_hanging_sign, bamboo_wood_hanging_sign, bamboo_wood, nether_wood_hanging_sign, bamboo_wood_hanging_sign, bamboo_wood,
nether_wood, cherry_wood, cherry_sapling, cherry_leaves, nether_wood, cherry_wood, cherry_sapling, cherry_leaves,
cherry_wood_hanging_sign, chiseled_bookshelf, suspicious_sand, cherry_wood_hanging_sign, chiseled_bookshelf, suspicious_sand,
suspicious_gravel, decorated_pot, decorated_pot_shatter suspicious_gravel, decorated_pot, decorated_pot_shatter,
trial_spawner, sponge, wet_sponge, vault, heavy_core,
cobweb
changes how the block sounds changes how the block sounds
"dropTableId" ~ string "dropTableId" ~ string

23
build.gradle
View File

@ -1,6 +1,6 @@
plugins { plugins {
id "com.modrinth.minotaur" version "2.+" id "com.modrinth.minotaur" version "2.+"
id 'fabric-loom' version '1.2-SNAPSHOT' id 'fabric-loom' version '1.7-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
} }
@ -49,18 +49,11 @@ dependencies {
// Uncomment the following line to enable the deprecated Fabric API modules. // Uncomment the following line to enable the deprecated Fabric API modules.
// These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
include "maven.modrinth:midnightlib:${project.midnightlib_version}"
include(modApi(platform("de.siphalor.tweed4:tweed4-bom-$project.minecraft_major_version:$project.tweed_version"))) modImplementation("me.shedaniel.cloth:cloth-config-fabric:$project.cloth_config_version")
// Pick any modules you want to use, e.g.:
include(modApi("de.siphalor.tweed4:tweed4-base-$project.minecraft_major_version"))
include(modApi("de.siphalor.tweed4:tweed4-annotated-$project.minecraft_major_version"))
include(modApi("de.siphalor.tweed4:tweed4-data-$project.minecraft_major_version"))
include(modApi("de.siphalor.tweed4:tweed4-data-hjson-$project.minecraft_major_version"))
//include(modApi("de.siphalor.tweed4:tweed4-tailor-cloth-$project.minecraft_major_version"))
include(modApi("de.siphalor.tweed4:tweed4-tailor-screen-$project.minecraft_major_version"))
modImplementation("me.shedaniel.cloth:cloth-config-fabric:$project.cloth_config_version")
// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
} }
@ -80,7 +73,7 @@ processResources {
} }
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {
it.options.release = 17 it.options.release = 21
} }
java { java {
@ -89,8 +82,8 @@ java {
// If you remove this line, sources will not be generated. // If you remove this line, sources will not be generated.
withSourcesJar() withSourcesJar()
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_21
} }
jar { jar {
@ -104,7 +97,7 @@ import com.modrinth.minotaur.dependencies.ModDependency
modrinth { modrinth {
projectId = 'vHsuCD0F' // The ID of your Modrinth project. Slugs will not work. projectId = 'vHsuCD0F' // The ID of your Modrinth project. Slugs will not work.
uploadFile = remapJar // Tells Minotaur to use the remapped jar uploadFile = remapJar // Tells Minotaur to use the remapped jar
versionType = "beta" versionType = "alpha"
dependencies = [ dependencies = [
new ModDependency('P7dR8mSH', 'required'), //required dependency on Fabric API new ModDependency('P7dR8mSH', 'required'), //required dependency on Fabric API
] ]

15
gradle.properties
View File

@ -1,18 +1,17 @@
org.gradle.jvmargs = -Xmx1G org.gradle.jvmargs = -Xmx1G
#Fabric properties #Fabric properties
minecraft_version=1.20.1 minecraft_version=1.21
minecraft_major_version=1.20 yarn_mappings=1.21+build.8
yarn_mappings=1.20.1+build.9 loader_version=0.15.11
loader_version=0.14.21
#Fabric api # Fabric API
fabric_version=0.84.0+1.20.1 fabric_version=0.100.6+1.21
#Mod properties #Mod properties
mod_version = 0.10.2 mod_version = 0.10.2
maven_group = quimufu.simple_creator maven_group = quimufu.simple_creator
archives_base_name = simple_creator archives_base_name = simple_creator
tweed_version=1.3.0+mc1.20-pre1 cloth_config_version=15.0.127
cloth_config_version=11.0.99 midnightlib_version=1.5.7-fabric

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

661
src/main/java/quimufu/simple_creator/BlockResourceLoader.java
View File

@ -4,7 +4,6 @@ import com.google.common.collect.Maps;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
@ -12,15 +11,17 @@ import net.minecraft.block.AbstractBlock;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.MapColor; import net.minecraft.block.MapColor;
import net.minecraft.block.enums.Instrument; import net.minecraft.block.enums.NoteBlockInstrument;
import net.minecraft.block.piston.PistonBehavior; import net.minecraft.block.piston.PistonBehavior;
import net.minecraft.entity.EntityType; import net.minecraft.entity.EntityType;
import net.minecraft.item.BlockItem; import net.minecraft.item.BlockItem;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemGroup;
import net.minecraft.loot.LootTable;
import net.minecraft.registry.Registries; import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry; import net.minecraft.registry.Registry;
import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.sound.BlockSoundGroup; import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.Pair; import net.minecraft.util.Pair;
@ -58,6 +59,7 @@ public class BlockResourceLoader extends GenericManualResourceLoader<Pair<Block,
@Override @Override
protected Pair<Block, Item> deserialize(Pair<Identifier, JsonObject> e) { protected Pair<Block, Item> deserialize(Pair<Identifier, JsonObject> e) {
JsonObject jo = e.getRight(); JsonObject jo = e.getRight();
log(Level.INFO, e.getRight().toString());
// get block information // get block information
BlockSettingsPojo bspj = GSON.fromJson(jo, BlockSettingsPojo.class); BlockSettingsPojo bspj = GSON.fromJson(jo, BlockSettingsPojo.class);
@ -70,7 +72,7 @@ public class BlockResourceLoader extends GenericManualResourceLoader<Pair<Block,
RegistryKey<ItemGroup> g = ItemResourceLoader.findGroup(group); RegistryKey<ItemGroup> g = ItemResourceLoader.findGroup(group);
//create block and corresponding item //create block and corresponding item
Block resB = new Block(bs); Block resB = new Block(bs);
Item resI = new BlockItem(resB, new FabricItemSettings()); Item resI = new BlockItem(resB, new Item.Settings());
ItemGroupEvents.modifyEntriesEvent(g).register(content -> content.add(resI)); ItemGroupEvents.modifyEntriesEvent(g).register(content -> content.add(resI));
int burnChance = bspj.burnChance; int burnChance = bspj.burnChance;
@ -140,73 +142,49 @@ public class BlockResourceLoader extends GenericManualResourceLoader<Pair<Block,
return fabricBlockSettings; return fabricBlockSettings;
} }
private Instrument getInstrument(String instrument) { private NoteBlockInstrument getInstrument(String instrument) {
switch (instrument.toUpperCase()) { return switch (instrument.toUpperCase()) {
case "HARP": case "HARP" -> NoteBlockInstrument.HARP;
return Instrument.HARP; case "BASEDRUM" -> NoteBlockInstrument.BASEDRUM;
case "BASEDRUM": case "SNARE" -> NoteBlockInstrument.SNARE;
return Instrument.BASEDRUM; case "HAT" -> NoteBlockInstrument.HAT;
case "SNARE": case "BASS" -> NoteBlockInstrument.BASS;
return Instrument.SNARE; case "FLUTE" -> NoteBlockInstrument.FLUTE;
case "HAT": case "BELL" -> NoteBlockInstrument.BELL;
return Instrument.HAT; case "GUITAR" -> NoteBlockInstrument.GUITAR;
case "BASS": case "CHIME" -> NoteBlockInstrument.CHIME;
return Instrument.BASS; case "XYLOPHONE" -> NoteBlockInstrument.XYLOPHONE;
case "FLUTE": case "IRON_XYLOPHONE" -> NoteBlockInstrument.IRON_XYLOPHONE;
return Instrument.FLUTE; case "COW_BELL" -> NoteBlockInstrument.COW_BELL;
case "BELL": case "DIDGERIDOO" -> NoteBlockInstrument.DIDGERIDOO;
return Instrument.BELL; case "BIT" -> NoteBlockInstrument.BIT;
case "GUITAR": case "BANJO" -> NoteBlockInstrument.BANJO;
return Instrument.GUITAR; case "PLING" -> NoteBlockInstrument.PLING;
case "CHIME": case "ZOMBIE" -> NoteBlockInstrument.ZOMBIE;
return Instrument.CHIME; case "SKELETON" -> NoteBlockInstrument.SKELETON;
case "XYLOPHONE": case "CREEPER" -> NoteBlockInstrument.CREEPER;
return Instrument.XYLOPHONE; case "DRAGON" -> NoteBlockInstrument.DRAGON;
case "IRON_XYLOPHONE": case "WITHER_SKELETON" -> NoteBlockInstrument.WITHER_SKELETON;
return Instrument.IRON_XYLOPHONE; case "PIGLIN" -> NoteBlockInstrument.PIGLIN;
case "COW_BELL": case "CUSTOM_HEAD" -> NoteBlockInstrument.CUSTOM_HEAD;
return Instrument.COW_BELL; default -> {
case "DIDGERIDOO":
return Instrument.DIDGERIDOO;
case "BIT":
return Instrument.BIT;
case "BANJO":
return Instrument.BANJO;
case "PLING":
return Instrument.PLING;
case "ZOMBIE":
return Instrument.ZOMBIE;
case "SKELETON":
return Instrument.SKELETON;
case "CREEPER":
return Instrument.CREEPER;
case "DRAGON":
return Instrument.DRAGON;
case "WITHER_SKELETON":
return Instrument.WITHER_SKELETON;
case "PIGLIN":
return Instrument.PIGLIN;
case "CUSTOM_HEAD":
return Instrument.CUSTOM_HEAD;
default:
log(Level.WARN, "Instrument " + instrument + " not found, using harp"); log(Level.WARN, "Instrument " + instrument + " not found, using harp");
return Instrument.HARP; yield NoteBlockInstrument.HARP;
} }
};
} }
private AbstractBlock.OffsetType getOffset(String modelOffset) { private AbstractBlock.OffsetType getOffset(String modelOffset) {
switch (modelOffset.toUpperCase()) { return switch (modelOffset.toUpperCase()) {
case "NONE": case "NONE" -> AbstractBlock.OffsetType.NONE;
return AbstractBlock.OffsetType.NONE; case "XZ" -> AbstractBlock.OffsetType.XZ;
case "XZ": case "XYZ" -> AbstractBlock.OffsetType.XYZ;
return AbstractBlock.OffsetType.XZ; default -> {
case "XYZ":
return AbstractBlock.OffsetType.XYZ;
default:
log(Level.WARN, "ModelOffset " + modelOffset + " not found, using none"); log(Level.WARN, "ModelOffset " + modelOffset + " not found, using none");
return AbstractBlock.OffsetType.NONE; yield AbstractBlock.OffsetType.NONE;
} }
};
} }
@ -235,386 +213,221 @@ public class BlockResourceLoader extends GenericManualResourceLoader<Pair<Block,
} }
private PistonBehavior getPistonBehavior(String pistonBehavior) { private PistonBehavior getPistonBehavior(String pistonBehavior) {
switch (pistonBehavior.toUpperCase()) { return switch (pistonBehavior.toUpperCase()) {
case "NORMAL" -> { case "NORMAL" -> PistonBehavior.NORMAL;
return PistonBehavior.NORMAL; case "DESTROY" -> PistonBehavior.DESTROY;
} case "BLOCK" -> PistonBehavior.BLOCK;
case "DESTROY" -> { case "IGNORE" -> PistonBehavior.IGNORE;
return PistonBehavior.DESTROY; case "PUSH_ONLY" -> PistonBehavior.PUSH_ONLY;
}
case "BLOCK" -> {
return PistonBehavior.BLOCK;
}
case "IGNORE" -> {
return PistonBehavior.IGNORE;
}
case "PUSH_ONLY" -> {
return PistonBehavior.PUSH_ONLY;
}
default -> { default -> {
log(Level.WARN, "Piston Behavior " + pistonBehavior + " not found, using normal"); log(Level.WARN, "Piston Behavior " + pistonBehavior + " not found, using normal");
return PistonBehavior.NORMAL; yield PistonBehavior.NORMAL;
} }
} };
} }
private MapColor getMapColor(String color) { private MapColor getMapColor(String color) {
switch (color.toUpperCase()) { return switch (color.toUpperCase()) {
case "CLEAR": case "CLEAR" -> MapColor.CLEAR;
return MapColor.CLEAR; case "PALE_GREEN" -> MapColor.PALE_GREEN;
case "PALE_GREEN": case "PALE_YELLOW" -> MapColor.PALE_YELLOW;
return MapColor.PALE_GREEN; case "WHITE_GRAY" -> MapColor.WHITE_GRAY;
case "PALE_YELLOW": case "BRIGHT_RED" -> MapColor.BRIGHT_RED;
return MapColor.PALE_YELLOW; case "PALE_PURPLE" -> MapColor.PALE_PURPLE;
case "WHITE_GRAY": case "IRON_GRAY" -> MapColor.IRON_GRAY;
return MapColor.WHITE_GRAY; case "DARK_GREEN" -> MapColor.DARK_GREEN;
case "BRIGHT_RED": case "WHITE" -> MapColor.WHITE;
return MapColor.BRIGHT_RED; case "LIGHT_BLUE_GRAY" -> MapColor.LIGHT_BLUE_GRAY;
case "PALE_PURPLE": case "DIRT_BROWN" -> MapColor.DIRT_BROWN;
return MapColor.PALE_PURPLE; case "STONE_GRAY" -> MapColor.STONE_GRAY;
case "IRON_GRAY": case "WATER_BLUE" -> MapColor.WATER_BLUE;
return MapColor.IRON_GRAY; case "OAK_TAN" -> MapColor.OAK_TAN;
case "DARK_GREEN": case "OFF_WHITE" -> MapColor.OFF_WHITE;
return MapColor.DARK_GREEN; case "ORANGE" -> MapColor.ORANGE;
case "WHITE": case "MAGENTA" -> MapColor.MAGENTA;
return MapColor.WHITE; case "LIGHT_BLUE" -> MapColor.LIGHT_BLUE;
case "LIGHT_BLUE_GRAY": case "YELLOW" -> MapColor.YELLOW;
return MapColor.LIGHT_BLUE_GRAY; case "LIME" -> MapColor.LIME;
case "DIRT_BROWN": case "PINK" -> MapColor.PINK;
return MapColor.DIRT_BROWN; case "GRAY" -> MapColor.GRAY;
case "STONE_GRAY": case "LIGHT_GRAY" -> MapColor.LIGHT_GRAY;
return MapColor.STONE_GRAY; case "CYAN" -> MapColor.CYAN;
case "WATER_BLUE": case "PURPLE" -> MapColor.PURPLE;
return MapColor.WATER_BLUE; case "BLUE" -> MapColor.BLUE;
case "OAK_TAN": case "BROWN" -> MapColor.BROWN;
return MapColor.OAK_TAN; case "GREEN" -> MapColor.GREEN;
case "OFF_WHITE": case "RED" -> MapColor.RED;
return MapColor.OFF_WHITE; case "BLACK" -> MapColor.BLACK;
case "ORANGE": case "GOLD" -> MapColor.GOLD;
return MapColor.ORANGE; case "DIAMOND_BLUE" -> MapColor.DIAMOND_BLUE;
case "MAGENTA": case "LAPIS_BLUE" -> MapColor.LAPIS_BLUE;
return MapColor.MAGENTA; case "EMERALD_GREEN" -> MapColor.EMERALD_GREEN;
case "LIGHT_BLUE": case "SPRUCE_BROWN" -> MapColor.SPRUCE_BROWN;
return MapColor.LIGHT_BLUE; case "DARK_RED" -> MapColor.DARK_RED;
case "YELLOW": case "TERRACOTTA_WHITE" -> MapColor.TERRACOTTA_WHITE;
return MapColor.YELLOW; case "TERRACOTTA_ORANGE" -> MapColor.TERRACOTTA_ORANGE;
case "LIME": case "TERRACOTTA_MAGENTA" -> MapColor.TERRACOTTA_MAGENTA;
return MapColor.LIME; case "TERRACOTTA_LIGHT_BLUE" -> MapColor.TERRACOTTA_LIGHT_BLUE;
case "PINK": case "TERRACOTTA_YELLOW" -> MapColor.TERRACOTTA_YELLOW;
return MapColor.PINK; case "TERRACOTTA_LIME" -> MapColor.TERRACOTTA_LIME;
case "GRAY": case "TERRACOTTA_PINK" -> MapColor.TERRACOTTA_PINK;
return MapColor.GRAY; case "TERRACOTTA_GRAY" -> MapColor.TERRACOTTA_GRAY;
case "LIGHT_GRAY": case "TERRACOTTA_LIGHT_GRAY" -> MapColor.TERRACOTTA_LIGHT_GRAY;
return MapColor.LIGHT_GRAY; case "TERRACOTTA_CYAN" -> MapColor.TERRACOTTA_CYAN;
case "CYAN": case "TERRACOTTA_PURPLE" -> MapColor.TERRACOTTA_PURPLE;
return MapColor.CYAN; case "TERRACOTTA_BLUE" -> MapColor.TERRACOTTA_BLUE;
case "PURPLE": case "TERRACOTTA_BROWN" -> MapColor.TERRACOTTA_BROWN;
return MapColor.PURPLE; case "TERRACOTTA_GREEN" -> MapColor.TERRACOTTA_GREEN;
case "BLUE": case "TERRACOTTA_RED" -> MapColor.TERRACOTTA_RED;
return MapColor.BLUE; case "TERRACOTTA_BLACK" -> MapColor.TERRACOTTA_BLACK;
case "BROWN": case "DULL_RED" -> MapColor.DULL_RED;
return MapColor.BROWN; case "DULL_PINK" -> MapColor.DULL_PINK;
case "GREEN": case "DARK_CRIMSON" -> MapColor.DARK_CRIMSON;
return MapColor.GREEN; case "TEAL" -> MapColor.TEAL;
case "RED": case "DARK_AQUA" -> MapColor.DARK_AQUA;
return MapColor.RED; case "DARK_DULL_PINK" -> MapColor.DARK_DULL_PINK;
case "BLACK": case "BRIGHT_TEAL" -> MapColor.BRIGHT_TEAL;
return MapColor.BLACK; case "DEEPSLATE_GRAY" -> MapColor.DEEPSLATE_GRAY;
case "GOLD": case "RAW_IRON_PINK" -> MapColor.RAW_IRON_PINK;
return MapColor.GOLD; case "LICHEN_GREEN" -> MapColor.LICHEN_GREEN;
case "DIAMOND_BLUE": default -> {
return MapColor.DIAMOND_BLUE;
case "LAPIS_BLUE":
return MapColor.LAPIS_BLUE;
case "EMERALD_GREEN":
return MapColor.EMERALD_GREEN;
case "SPRUCE_BROWN":
return MapColor.SPRUCE_BROWN;
case "DARK_RED":
return MapColor.DARK_RED;
case "TERRACOTTA_WHITE":
return MapColor.TERRACOTTA_WHITE;
case "TERRACOTTA_ORANGE":
return MapColor.TERRACOTTA_ORANGE;
case "TERRACOTTA_MAGENTA":
return MapColor.TERRACOTTA_MAGENTA;
case "TERRACOTTA_LIGHT_BLUE":
return MapColor.TERRACOTTA_LIGHT_BLUE;
case "TERRACOTTA_YELLOW":
return MapColor.TERRACOTTA_YELLOW;
case "TERRACOTTA_LIME":
return MapColor.TERRACOTTA_LIME;
case "TERRACOTTA_PINK":
return MapColor.TERRACOTTA_PINK;
case "TERRACOTTA_GRAY":
return MapColor.TERRACOTTA_GRAY;
case "TERRACOTTA_LIGHT_GRAY":
return MapColor.TERRACOTTA_LIGHT_GRAY;
case "TERRACOTTA_CYAN":
return MapColor.TERRACOTTA_CYAN;
case "TERRACOTTA_PURPLE":
return MapColor.TERRACOTTA_PURPLE;
case "TERRACOTTA_BLUE":
return MapColor.TERRACOTTA_BLUE;
case "TERRACOTTA_BROWN":
return MapColor.TERRACOTTA_BROWN;
case "TERRACOTTA_GREEN":
return MapColor.TERRACOTTA_GREEN;
case "TERRACOTTA_RED":
return MapColor.TERRACOTTA_RED;
case "TERRACOTTA_BLACK":
return MapColor.TERRACOTTA_BLACK;
case "DULL_RED":
return MapColor.DULL_RED;
case "DULL_PINK":
return MapColor.DULL_PINK;
case "DARK_CRIMSON":
return MapColor.DARK_CRIMSON;
case "TEAL":
return MapColor.TEAL;
case "DARK_AQUA":
return MapColor.DARK_AQUA;
case "DARK_DULL_PINK":
return MapColor.DARK_DULL_PINK;
case "BRIGHT_TEAL":
return MapColor.BRIGHT_TEAL;
case "DEEPSLATE_GRAY":
return MapColor.DEEPSLATE_GRAY;
case "RAW_IRON_PINK":
return MapColor.RAW_IRON_PINK;
case "LICHEN_GREEN":
return MapColor.LICHEN_GREEN;
default:
log(Level.WARN, "MapColor " + color + " not found, using pink"); log(Level.WARN, "MapColor " + color + " not found, using pink");
return MapColor.PINK; yield MapColor.PINK;
} }
};
} }
private Identifier getDropTableId(String s) { private RegistryKey<LootTable> getDropTableId(String s) {
if (s == null) if (s == null)
return null; return null;
Identifier i = Identifier.tryParse(s); Identifier i = Identifier.tryParse(s);
if (i == null) { if (i == null) {
log(Level.WARN, "Drop table invalid " + s + ", using default"); log(Level.WARN, "Drop table invalid " + s + ", using default");
i = null;
} }
return i; return RegistryKey.of(RegistryKeys.LOOT_TABLE, i);
} }
private BlockSoundGroup getSoundGroup(String s) { private BlockSoundGroup getSoundGroup(String s) {
switch (s.toUpperCase()) { return switch (s.toUpperCase()) {
case "INTENTIONALLY_EMPTY": case "INTENTIONALLY_EMPTY" -> BlockSoundGroup.INTENTIONALLY_EMPTY;
return BlockSoundGroup.INTENTIONALLY_EMPTY; case "WOOD" -> BlockSoundGroup.WOOD;
case "WOOD": case "GRAVEL" -> BlockSoundGroup.GRAVEL;
return BlockSoundGroup.WOOD; case "GRASS" -> BlockSoundGroup.GRASS;
case "GRAVEL": case "LILY_PAD" -> BlockSoundGroup.LILY_PAD;
return BlockSoundGroup.GRAVEL; case "STONE" -> BlockSoundGroup.STONE;
case "GRASS": case "METAL" -> BlockSoundGroup.METAL;
return BlockSoundGroup.GRASS; case "GLASS" -> BlockSoundGroup.GLASS;
case "LILY_PAD": case "WOOL" -> BlockSoundGroup.WOOL;
return BlockSoundGroup.LILY_PAD; case "SAND" -> BlockSoundGroup.SAND;
case "STONE": case "SNOW" -> BlockSoundGroup.SNOW;
return BlockSoundGroup.STONE; case "POWDER_SNOW" -> BlockSoundGroup.POWDER_SNOW;
case "METAL": case "LADDER" -> BlockSoundGroup.LADDER;
return BlockSoundGroup.METAL; case "ANVIL" -> BlockSoundGroup.ANVIL;
case "GLASS": case "SLIME" -> BlockSoundGroup.SLIME;
return BlockSoundGroup.GLASS; case "HONEY" -> BlockSoundGroup.HONEY;
case "WOOL": case "WET_GRASS" -> BlockSoundGroup.WET_GRASS;
return BlockSoundGroup.WOOL; case "CORAL" -> BlockSoundGroup.CORAL;
case "SAND": case "BAMBOO" -> BlockSoundGroup.BAMBOO;
return BlockSoundGroup.SAND; case "BAMBOO_SAPLING" -> BlockSoundGroup.BAMBOO_SAPLING;
case "SNOW": case "SCAFFOLDING" -> BlockSoundGroup.SCAFFOLDING;
return BlockSoundGroup.SNOW; case "SWEET_BERRY_BUSH" -> BlockSoundGroup.SWEET_BERRY_BUSH;
case "POWDER_SNOW": case "CROP" -> BlockSoundGroup.CROP;
return BlockSoundGroup.POWDER_SNOW; case "STEM" -> BlockSoundGroup.STEM;
case "LADDER": case "VINE" -> BlockSoundGroup.VINE;
return BlockSoundGroup.LADDER; case "NETHER_WART" -> BlockSoundGroup.NETHER_WART;
case "ANVIL": case "LANTERN" -> BlockSoundGroup.LANTERN;
return BlockSoundGroup.ANVIL; case "NETHER_STEM" -> BlockSoundGroup.NETHER_STEM;
case "SLIME": case "NYLIUM" -> BlockSoundGroup.NYLIUM;
return BlockSoundGroup.SLIME; case "FUNGUS" -> BlockSoundGroup.FUNGUS;
case "HONEY": case "ROOTS" -> BlockSoundGroup.ROOTS;
return BlockSoundGroup.HONEY; case "SHROOMLIGHT" -> BlockSoundGroup.SHROOMLIGHT;
case "WET_GRASS": case "WEEPING_VINES" -> BlockSoundGroup.WEEPING_VINES;
return BlockSoundGroup.WET_GRASS; case "WEEPING_VINES_LOW_PITCH" -> BlockSoundGroup.WEEPING_VINES_LOW_PITCH;
case "CORAL": case "SOUL_SAND" -> BlockSoundGroup.SOUL_SAND;
return BlockSoundGroup.CORAL; case "SOUL_SOIL" -> BlockSoundGroup.SOUL_SOIL;
case "BAMBOO": case "BASALT" -> BlockSoundGroup.BASALT;
return BlockSoundGroup.BAMBOO; case "WART_BLOCK" -> BlockSoundGroup.WART_BLOCK;
case "BAMBOO_SAPLING": case "NETHERRACK" -> BlockSoundGroup.NETHERRACK;
return BlockSoundGroup.BAMBOO_SAPLING; case "NETHER_BRICKS" -> BlockSoundGroup.NETHER_BRICKS;
case "SCAFFOLDING": case "NETHER_SPROUTS" -> BlockSoundGroup.NETHER_SPROUTS;
return BlockSoundGroup.SCAFFOLDING; case "NETHER_ORE" -> BlockSoundGroup.NETHER_ORE;
case "SWEET_BERRY_BUSH": case "BONE" -> BlockSoundGroup.BONE;
return BlockSoundGroup.SWEET_BERRY_BUSH; case "NETHERITE" -> BlockSoundGroup.NETHERITE;
case "CROP": case "ANCIENT_DEBRIS" -> BlockSoundGroup.ANCIENT_DEBRIS;
return BlockSoundGroup.CROP; case "LODESTONE" -> BlockSoundGroup.LODESTONE;
case "STEM": case "CHAIN" -> BlockSoundGroup.CHAIN;
return BlockSoundGroup.STEM; case "NETHER_GOLD_ORE" -> BlockSoundGroup.NETHER_GOLD_ORE;
case "VINE": case "GILDED_BLACKSTONE" -> BlockSoundGroup.GILDED_BLACKSTONE;
return BlockSoundGroup.VINE; case "CANDLE" -> BlockSoundGroup.CANDLE;
case "NETHER_WART": case "AMETHYST_BLOCK" -> BlockSoundGroup.AMETHYST_BLOCK;
return BlockSoundGroup.NETHER_WART; case "AMETHYST_CLUSTER" -> BlockSoundGroup.AMETHYST_CLUSTER;
case "LANTERN": case "SMALL_AMETHYST_BUD" -> BlockSoundGroup.SMALL_AMETHYST_BUD;
return BlockSoundGroup.LANTERN; case "MEDIUM_AMETHYST_BUD" -> BlockSoundGroup.MEDIUM_AMETHYST_BUD;
case "NETHER_STEM": case "LARGE_AMETHYST_BUD" -> BlockSoundGroup.LARGE_AMETHYST_BUD;
return BlockSoundGroup.NETHER_STEM; case "TUFF" -> BlockSoundGroup.TUFF;
case "NYLIUM": case "TUFF_BRICKS" -> BlockSoundGroup.TUFF_BRICKS;
return BlockSoundGroup.NYLIUM; case "POLISHED_TUFF" -> BlockSoundGroup.POLISHED_TUFF;
case "FUNGUS": case "CALCITE" -> BlockSoundGroup.CALCITE;
return BlockSoundGroup.FUNGUS; case "DRIPSTONE_BLOCK" -> BlockSoundGroup.DRIPSTONE_BLOCK;
case "ROOTS": case "POINTED_DRIPSTONE" -> BlockSoundGroup.POINTED_DRIPSTONE;
return BlockSoundGroup.ROOTS; case "COPPER" -> BlockSoundGroup.COPPER;
case "SHROOMLIGHT": case "COPPER_BULB" -> BlockSoundGroup.COPPER_BULB;
return BlockSoundGroup.SHROOMLIGHT; case "COPPER_GRATE" -> BlockSoundGroup.COPPER_GRATE;
case "WEEPING_VINES": case "CAVE_VINES" -> BlockSoundGroup.CAVE_VINES;
return BlockSoundGroup.WEEPING_VINES; case "SPORE_BLOSSOM" -> BlockSoundGroup.SPORE_BLOSSOM;
case "WEEPING_VINES_LOW_PITCH": case "AZALEA" -> BlockSoundGroup.AZALEA;
return BlockSoundGroup.WEEPING_VINES_LOW_PITCH; case "FLOWERING_AZALEA" -> BlockSoundGroup.FLOWERING_AZALEA;
case "SOUL_SAND": case "MOSS_CARPET" -> BlockSoundGroup.MOSS_CARPET;
return BlockSoundGroup.SOUL_SAND; case "PINK_PETALS" -> BlockSoundGroup.PINK_PETALS;
case "SOUL_SOIL": case "MOSS_BLOCK" -> BlockSoundGroup.MOSS_BLOCK;
return BlockSoundGroup.SOUL_SOIL; case "BIG_DRIPLEAF" -> BlockSoundGroup.BIG_DRIPLEAF;
case "BASALT": case "SMALL_DRIPLEAF" -> BlockSoundGroup.SMALL_DRIPLEAF;
return BlockSoundGroup.BASALT; case "ROOTED_DIRT" -> BlockSoundGroup.ROOTED_DIRT;
case "WART_BLOCK": case "HANGING_ROOTS" -> BlockSoundGroup.HANGING_ROOTS;
return BlockSoundGroup.WART_BLOCK; case "AZALEA_LEAVES" -> BlockSoundGroup.AZALEA_LEAVES;
case "NETHERRACK": case "SCULK_SENSOR" -> BlockSoundGroup.SCULK_SENSOR;
return BlockSoundGroup.NETHERRACK; case "SCULK_CATALYST" -> BlockSoundGroup.SCULK_CATALYST;
case "NETHER_BRICKS": case "SCULK" -> BlockSoundGroup.SCULK;
return BlockSoundGroup.NETHER_BRICKS; case "SCULK_VEIN" -> BlockSoundGroup.SCULK_VEIN;
case "NETHER_SPROUTS": case "SCULK_SHRIEKER" -> BlockSoundGroup.SCULK_SHRIEKER;
return BlockSoundGroup.NETHER_SPROUTS; case "GLOW_LICHEN" -> BlockSoundGroup.GLOW_LICHEN;
case "NETHER_ORE": case "DEEPSLATE" -> BlockSoundGroup.DEEPSLATE;
return BlockSoundGroup.NETHER_ORE; case "DEEPSLATE_BRICKS" -> BlockSoundGroup.DEEPSLATE_BRICKS;
case "BONE": case "DEEPSLATE_TILES" -> BlockSoundGroup.DEEPSLATE_TILES;
return BlockSoundGroup.BONE; case "POLISHED_DEEPSLATE" -> BlockSoundGroup.POLISHED_DEEPSLATE;
case "NETHERITE": case "FROGLIGHT" -> BlockSoundGroup.FROGLIGHT;
return BlockSoundGroup.NETHERITE; case "FROGSPAWN" -> BlockSoundGroup.FROGSPAWN;
case "ANCIENT_DEBRIS": case "MANGROVE_ROOTS" -> BlockSoundGroup.MANGROVE_ROOTS;
return BlockSoundGroup.ANCIENT_DEBRIS; case "MUDDY_MANGROVE_ROOTS" -> BlockSoundGroup.MUDDY_MANGROVE_ROOTS;
case "LODESTONE": case "MUD" -> BlockSoundGroup.MUD;
return BlockSoundGroup.LODESTONE; case "MUD_BRICKS" -> BlockSoundGroup.MUD_BRICKS;
case "CHAIN": case "PACKED_MUD" -> BlockSoundGroup.PACKED_MUD;
return BlockSoundGroup.CHAIN; case "HANGING_SIGN" -> BlockSoundGroup.HANGING_SIGN;
case "NETHER_GOLD_ORE": case "NETHER_WOOD_HANGING_SIGN" -> BlockSoundGroup.NETHER_WOOD_HANGING_SIGN;
return BlockSoundGroup.NETHER_GOLD_ORE; case "BAMBOO_WOOD_HANGING_SIGN" -> BlockSoundGroup.BAMBOO_WOOD_HANGING_SIGN;
case "GILDED_BLACKSTONE": case "BAMBOO_WOOD" -> BlockSoundGroup.BAMBOO_WOOD;
return BlockSoundGroup.GILDED_BLACKSTONE; case "NETHER_WOOD" -> BlockSoundGroup.NETHER_WOOD;
case "CANDLE": case "CHERRY_WOOD" -> BlockSoundGroup.CHERRY_WOOD;
return BlockSoundGroup.CANDLE; case "CHERRY_SAPLING" -> BlockSoundGroup.CHERRY_SAPLING;
case "AMETHYST_BLOCK": case "CHERRY_LEAVES" -> BlockSoundGroup.CHERRY_LEAVES;
return BlockSoundGroup.AMETHYST_BLOCK; case "CHERRY_WOOD_HANGING_SIGN" -> BlockSoundGroup.CHERRY_WOOD_HANGING_SIGN;
case "AMETHYST_CLUSTER": case "CHISELED_BOOKSHELF" -> BlockSoundGroup.CHISELED_BOOKSHELF;
return BlockSoundGroup.AMETHYST_CLUSTER; case "SUSPICIOUS_SAND" -> BlockSoundGroup.SUSPICIOUS_SAND;
case "SMALL_AMETHYST_BUD": case "SUSPICIOUS_GRAVEL" -> BlockSoundGroup.SUSPICIOUS_GRAVEL;
return BlockSoundGroup.SMALL_AMETHYST_BUD; case "DECORATED_POT" -> BlockSoundGroup.DECORATED_POT;
case "MEDIUM_AMETHYST_BUD": case "DECORATED_POT_SHATTER" -> BlockSoundGroup.DECORATED_POT_SHATTER;
return BlockSoundGroup.MEDIUM_AMETHYST_BUD; case "TRIAL_SPAWNER" -> BlockSoundGroup.TRIAL_SPAWNER;
case "LARGE_AMETHYST_BUD": case "SPONGE" -> BlockSoundGroup.SPONGE;
return BlockSoundGroup.LARGE_AMETHYST_BUD; case "WET_SPONGE" -> BlockSoundGroup.WET_SPONGE;
case "TUFF": case "VAULT" -> BlockSoundGroup.VAULT;
return BlockSoundGroup.TUFF; case "HEAVY_CORE" -> BlockSoundGroup.HEAVY_CORE;
case "CALCITE": case "COBWEB" -> BlockSoundGroup.COBWEB;
return BlockSoundGroup.CALCITE; default -> {
case "DRIPSTONE_BLOCK":
return BlockSoundGroup.DRIPSTONE_BLOCK;
case "POINTED_DRIPSTONE":
return BlockSoundGroup.POINTED_DRIPSTONE;
case "COPPER":
return BlockSoundGroup.COPPER;
case "CAVE_VINES":
return BlockSoundGroup.CAVE_VINES;
case "SPORE_BLOSSOM":
return BlockSoundGroup.SPORE_BLOSSOM;
case "AZALEA":
return BlockSoundGroup.AZALEA;
case "FLOWERING_AZALEA":
return BlockSoundGroup.FLOWERING_AZALEA;
case "MOSS_CARPET":
return BlockSoundGroup.MOSS_CARPET;
case "PINK_PETALS":
return BlockSoundGroup.PINK_PETALS;
case "MOSS_BLOCK":
return BlockSoundGroup.MOSS_BLOCK;
case "BIG_DRIPLEAF":
return BlockSoundGroup.BIG_DRIPLEAF;
case "SMALL_DRIPLEAF":
return BlockSoundGroup.SMALL_DRIPLEAF;
case "ROOTED_DIRT":
return BlockSoundGroup.ROOTED_DIRT;
case "HANGING_ROOTS":
return BlockSoundGroup.HANGING_ROOTS;
case "AZALEA_LEAVES":
return BlockSoundGroup.AZALEA_LEAVES;
case "SCULK_SENSOR":
return BlockSoundGroup.SCULK_SENSOR;
case "SCULK_CATALYST":
return BlockSoundGroup.SCULK_CATALYST;
case "SCULK":
return BlockSoundGroup.SCULK;
case "SCULK_VEIN":
return BlockSoundGroup.SCULK_VEIN;
case "SCULK_SHRIEKER":
return BlockSoundGroup.SCULK_SHRIEKER;
case "GLOW_LICHEN":
return BlockSoundGroup.GLOW_LICHEN;
case "DEEPSLATE":
return BlockSoundGroup.DEEPSLATE;
case "DEEPSLATE_BRICKS":
return BlockSoundGroup.DEEPSLATE_BRICKS;
case "DEEPSLATE_TILES":
return BlockSoundGroup.DEEPSLATE_TILES;
case "POLISHED_DEEPSLATE":
return BlockSoundGroup.POLISHED_DEEPSLATE;
case "FROGLIGHT":
return BlockSoundGroup.FROGLIGHT;
case "FROGSPAWN":
return BlockSoundGroup.FROGSPAWN;
case "MANGROVE_ROOTS":
return BlockSoundGroup.MANGROVE_ROOTS;
case "MUDDY_MANGROVE_ROOTS":
return BlockSoundGroup.MUDDY_MANGROVE_ROOTS;
case "MUD":
return BlockSoundGroup.MUD;
case "MUD_BRICKS":
return BlockSoundGroup.MUD_BRICKS;
case "PACKED_MUD":
return BlockSoundGroup.PACKED_MUD;
case "HANGING_SIGN":
return BlockSoundGroup.HANGING_SIGN;
case "NETHER_WOOD_HANGING_SIGN":
return BlockSoundGroup.NETHER_WOOD_HANGING_SIGN;
case "BAMBOO_WOOD_HANGING_SIGN":
return BlockSoundGroup.BAMBOO_WOOD_HANGING_SIGN;
case "BAMBOO_WOOD":
return BlockSoundGroup.BAMBOO_WOOD;
case "NETHER_WOOD":
return BlockSoundGroup.NETHER_WOOD;
case "CHERRY_WOOD":
return BlockSoundGroup.CHERRY_WOOD;
case "CHERRY_SAPLING":
return BlockSoundGroup.CHERRY_SAPLING;
case "CHERRY_LEAVES":
return BlockSoundGroup.CHERRY_LEAVES;
case "CHERRY_WOOD_HANGING_SIGN":
return BlockSoundGroup.CHERRY_WOOD_HANGING_SIGN;
case "CHISELED_BOOKSHELF":
return BlockSoundGroup.CHISELED_BOOKSHELF;
case "SUSPICIOUS_SAND":
return BlockSoundGroup.SUSPICIOUS_SAND;
case "SUSPICIOUS_GRAVEL":
return BlockSoundGroup.SUSPICIOUS_GRAVEL;
case "DECORATED_POT":
return BlockSoundGroup.DECORATED_POT;
case "DECORATED_POT_SHATTER":
return BlockSoundGroup.DECORATED_POT_SHATTER;
default:
log(Level.WARN, "Sound group " + s + " not found, using stone"); log(Level.WARN, "Sound group " + s + " not found, using stone");
return BlockSoundGroup.STONE; yield BlockSoundGroup.STONE;
} }
};
} }

2
src/main/java/quimufu/simple_creator/GenericManualResourceLoader.java
View File

@ -88,7 +88,7 @@ public abstract class GenericManualResourceLoader<T> {
continue; continue;
} }
String entryName = blockJsonName.substring(0,blockJsonName.length()-5); String entryName = blockJsonName.substring(0,blockJsonName.length()-5);
Identifier identifier = new Identifier(modId, entryName); Identifier identifier = Identifier.of(modId, entryName);
try (Reader reader = new FileReader(entryJson)) { try (Reader reader = new FileReader(entryJson)) {
JsonObject jsonObject = gson.fromJson(reader, JsonObject.class); JsonObject jsonObject = gson.fromJson(reader, JsonObject.class);

17
src/main/java/quimufu/simple_creator/ItemResourceLoader.java
View File

@ -3,15 +3,16 @@ package quimufu.simple_creator;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.gson.*; import com.google.gson.*;
import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
import net.minecraft.component.type.FoodComponent;
import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.effect.StatusEffect;
import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.item.FoodComponent;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemGroups; import net.minecraft.item.ItemGroups;
import net.minecraft.registry.Registries; import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry; import net.minecraft.registry.Registry;
import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.entry.RegistryEntry;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.JsonHelper; import net.minecraft.util.JsonHelper;
import net.minecraft.util.Pair; import net.minecraft.util.Pair;
@ -86,12 +87,10 @@ public class ItemResourceLoader extends GenericManualResourceLoader<Item> {
private static FoodComponent deserializeFoodComponent(JsonObject jo) { private static FoodComponent deserializeFoodComponent(JsonObject jo) {
FoodComponent fc; FoodComponent fc;
FoodComponent.Builder fcb = new FoodComponent.Builder(); FoodComponent.Builder fcb = new FoodComponent.Builder();
fcb.hunger(JsonHelper.getInt(jo, "hunger", 4)); fcb.nutrition(JsonHelper.getInt(jo, "hunger", 4));
fcb.saturationModifier(JsonHelper.getFloat(jo, "saturationModifier", 0.3F)); fcb.saturationModifier(JsonHelper.getFloat(jo, "saturationModifier", 0.3F));
if (JsonHelper.getBoolean(jo, "isAlwaysEdible", false)) if (JsonHelper.getBoolean(jo, "isAlwaysEdible", false))
fcb.alwaysEdible(); fcb.alwaysEdible();
if (JsonHelper.getBoolean(jo, "isWolfFood", false))
fcb.meat();
if (JsonHelper.getBoolean(jo, "isFast", false)) if (JsonHelper.getBoolean(jo, "isFast", false))
fcb.snack(); fcb.snack();
if (JsonHelper.hasArray(jo, "effects")) { if (JsonHelper.hasArray(jo, "effects")) {
@ -104,7 +103,7 @@ public class ItemResourceLoader extends GenericManualResourceLoader<Item> {
private static void deserializeEffects(FoodComponent.Builder fcb, JsonArray ja) { private static void deserializeEffects(FoodComponent.Builder fcb, JsonArray ja) {
for (JsonElement e : ja) { for (JsonElement e : ja) {
StatusEffect type; RegistryEntry<StatusEffect> type;
int duration = 0; int duration = 0;
int amplifier = 0; int amplifier = 0;
boolean ambient = false; boolean ambient = false;
@ -114,9 +113,9 @@ public class ItemResourceLoader extends GenericManualResourceLoader<Item> {
String effect = JsonHelper.getString(jo, "effect"); String effect = JsonHelper.getString(jo, "effect");
Identifier ei = Identifier.tryParse(effect); Identifier ei = Identifier.tryParse(effect);
if (ei != null) { if (ei != null) {
StatusEffect se = Registries.STATUS_EFFECT.get(ei); Optional<RegistryEntry.Reference<StatusEffect>> se = Registries.STATUS_EFFECT.getEntry(ei);
if (se != null) { if (se.isPresent()) {
type = se; type = se.get();
} else { } else {
log(Level.WARN, "Effect " + ei + " not found, skipping"); log(Level.WARN, "Effect " + ei + " not found, skipping");
continue; continue;
@ -136,7 +135,7 @@ public class ItemResourceLoader extends GenericManualResourceLoader<Item> {
private static Rarity findRarity(String filter) { private static Rarity findRarity(String filter) {
for (Rarity r : Rarity.values()) { for (Rarity r : Rarity.values()) {
if (r.name().toLowerCase().equals(filter.toLowerCase())) if (r.name().equalsIgnoreCase(filter))
return r; return r;
} }
log(Level.WARN, "Rarity " + filter + " not found, using common"); log(Level.WARN, "Rarity " + filter + " not found, using common");

17
src/main/java/quimufu/simple_creator/SimpleCreatorConfig.java
View File

@ -1,19 +1,12 @@
package quimufu.simple_creator; package quimufu.simple_creator;
import com.google.common.base.CaseFormat; import eu.midnightdust.lib.config.MidnightConfig;
import de.siphalor.tweed4.annotated.AConfigEntry;
import de.siphalor.tweed4.annotated.ATweedConfig;
import de.siphalor.tweed4.config.ConfigEnvironment;
import de.siphalor.tweed4.config.ConfigScope;
public class SimpleCreatorConfig extends MidnightConfig {
@ATweedConfig(serializer = "tweed4:hjson", scope = ConfigScope.GAME, environment = ConfigEnvironment.UNIVERSAL, tailors = {"tweed4:lang_json_descriptions", "tweed4:coat", "tweed4:json_schema"}, casing = CaseFormat.LOWER_HYPHEN) @Comment(category = "text")
//@ClothData(modid = "tweed4_testmod") public static Comment explanation;
public class SimpleCreatorConfig {
@AConfigEntry(name = "enableTestThings", comment = "Enables included test Blocks and Items") @Entry(category = "text", name = "Enables included test Blocks and Items")
public static boolean enableTestThings = false; public static boolean enableTestThings = false;
public static boolean extendedLogging = false;
} }

14
src/main/java/quimufu/simple_creator/SimpleCreatorMod.java
View File

@ -1,9 +1,6 @@
package quimufu.simple_creator; package quimufu.simple_creator;
import de.siphalor.tweed4.Tweed; import eu.midnightdust.lib.config.MidnightConfig;
import de.siphalor.tweed4.config.ConfigEnvironment;
import de.siphalor.tweed4.config.ConfigLoader;
import de.siphalor.tweed4.config.TweedRegistry;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.ModInitializer; import net.fabricmc.api.ModInitializer;
import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.FabricLoader;
@ -28,15 +25,12 @@ public class SimpleCreatorMod implements ModInitializer {
@Override @Override
public void onInitialize() { public void onInitialize() {
log(Level.INFO, "Initializing"); log(Level.INFO, "Simply creating Blocks and Items");
Tweed.runEntryPoints(); MidnightConfig.init(MOD_ID, SimpleCreatorConfig.class);
ConfigLoader.initialReload(
TweedRegistry.getConfigFile(MOD_ID),
FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER ? ConfigEnvironment.SERVER : ConfigEnvironment.UNIVERSAL
);
irl.load(); irl.load();
brl.load(); brl.load();
log(Level.INFO, "Simply created!");
} }
public static void log(Level level, String message) { public static void log(Level level, String message) {

101
src/main/java/quimufu/simple_creator/SimpleCreatorModClient.java
View File

@ -20,70 +20,43 @@ public class SimpleCreatorModClient implements ClientModInitializer {
} }
private net.minecraft.client.render.RenderLayer getRenderLayer(String renderLayer) { private net.minecraft.client.render.RenderLayer getRenderLayer(String renderLayer) {
switch (renderLayer.toUpperCase()){ return switch (renderLayer.toUpperCase()) {
case "SOLID": case "SOLID" -> RenderLayer.getSolid();
return RenderLayer.getSolid(); case "CUTOUT_MIPPED" -> RenderLayer.getCutoutMipped();
case "CUTOUT_MIPPED": case "CUTOUT" -> RenderLayer.getCutout();
return RenderLayer.getCutoutMipped(); case "TRANSLUCENT" -> RenderLayer.getTranslucent();
case "CUTOUT": case "TRANSLUCENT_MOVING_BLOCK" -> RenderLayer.getTranslucentMovingBlock();
return RenderLayer.getCutout(); case "LEASH" -> RenderLayer.getLeash();
case "TRANSLUCENT": case "WATER_MASK" -> RenderLayer.getWaterMask();
return RenderLayer.getTranslucent(); case "ARMOR_ENTITY_GLINT" -> RenderLayer.getArmorEntityGlint();
case "TRANSLUCENT_MOVING_BLOCK": case "GLINT_TRANSLUCENT" -> RenderLayer.getGlintTranslucent();
return RenderLayer.getTranslucentMovingBlock(); case "GLINT" -> RenderLayer.getGlint();
case "TRANSLUCENT_NO_CRUMBLING": case "ENTITY_GLINT" -> RenderLayer.getEntityGlint();
return RenderLayer.getTranslucentNoCrumbling(); case "DIRECT_ENTITY_GLINT" -> RenderLayer.getDirectEntityGlint();
case "LEASH": case "TEXT_BACKGROUND" -> RenderLayer.getTextBackground();
return RenderLayer.getLeash(); case "TEXT_BACKGROUND_SEE_THROUGH" -> RenderLayer.getTextBackgroundSeeThrough();
case "WATER_MASK": case "LIGHTNING" -> RenderLayer.getLightning();
return RenderLayer.getWaterMask(); case "DRAGON_RAYS" -> RenderLayer.getDragonRays();
case "ARMOR_GLINT": case "DRAGON_RAYS_DEPTH" -> RenderLayer.getDragonRaysDepth();
return RenderLayer.getArmorGlint(); case "TRIPWIRE" -> RenderLayer.getTripwire();
case "ARMOR_ENTITY_GLINT": case "END_PORTAL" -> RenderLayer.getEndPortal();
return RenderLayer.getArmorEntityGlint(); case "END_GATEWAY" -> RenderLayer.getEndGateway();
case "GLINT_TRANSLUCENT": case "FAST_CLOUDS" -> RenderLayer.getFastClouds();
return RenderLayer.getGlintTranslucent(); case "FANCY_CLOUDS" -> RenderLayer.getFancyClouds();
case "GLINT": case "LINES" -> RenderLayer.getLines();
return RenderLayer.getGlint(); case "LINE_STRIP" -> RenderLayer.getLineStrip();
case "DIRECT_GLINT": case "DEBUG_FILLED_BOX" -> RenderLayer.getDebugFilledBox();
return RenderLayer.getDirectGlint(); case "DEBUG_QUADS" -> RenderLayer.getDebugQuads();
case "ENTITY_GLINT": case "DEBUG_STRUCTURE_QUADS" -> RenderLayer.getDebugStructureQuads();
return RenderLayer.getEntityGlint(); case "DEBUG_SECTION_QUADS" -> RenderLayer.getDebugSectionQuads();
case "DIRECT_ENTITY_GLINT": case "GUI" -> RenderLayer.getGui();
return RenderLayer.getDirectEntityGlint(); case "GUI_OVERLAY" -> RenderLayer.getGuiOverlay();
case "TEXT_BACKGROUND": case "GUI_TEXT_HIGHLIGHT" -> RenderLayer.getGuiTextHighlight();
return RenderLayer.getTextBackground(); case "GUI_GHOST_RECIPE_OVERLAY" -> RenderLayer.getGuiGhostRecipeOverlay();
case "TEXT_BACKGROUND_SEE_THROUGH": default -> {
return RenderLayer.getTextBackgroundSeeThrough();
case "LIGHTNING":
return RenderLayer.getLightning();
case "TRIPWIRE":
return RenderLayer.getTripwire();
case "END_PORTAL":
return RenderLayer.getEndPortal();
case "END_GATEWAY":
return RenderLayer.getEndGateway();
case "LINES":
return RenderLayer.getLines();
case "LINE_STRIP":
return RenderLayer.getLineStrip();
case "DEBUG_FILLED_BOX":
return RenderLayer.getDebugFilledBox();
case "DEBUG_QUADS":
return RenderLayer.getDebugQuads();
case "DEBUG_SECTION_QUADS":
return RenderLayer.getDebugSectionQuads();
case "GUI":
return RenderLayer.getGui();
case "GUI_OVERLAY":
return RenderLayer.getGuiOverlay();
case "GUI_TEXT_HIGHLIGHT":
return RenderLayer.getGuiTextHighlight();
case "GUI_GHOST_RECIPE_OVERLAY":
return RenderLayer.getGuiGhostRecipeOverlay();
default:
SimpleCreatorMod.log(Level.INFO, "Could not find renderLayer " + renderLayer + " using solid"); SimpleCreatorMod.log(Level.INFO, "Could not find renderLayer " + renderLayer + " using solid");
return RenderLayer.getSolid(); yield RenderLayer.getSolid();
} }
};
} }
} }

4
src/main/resources/assets/simple_creator/lang/en_us.json
View File

@ -1,6 +1,6 @@
{ {
"text.autoconfig.simple_creator.title": "Simple Item/Block Creator Settings", "simple_creator.midnightconfig.title": "Simple Item/Block Creator Settings",
"text.autoconfig.simple_creator.option.enableTestThings": "Enable a test item and block", "simple_creator.midnightconfig.enableTestThings": "Enable a test item and block",
"item.simple_creator.test_item": "Forbidden Fruit", "item.simple_creator.test_item": "Forbidden Fruit",
"block.simple_creator.test_block": "Fast jumpy wooly diamond-dropping block of Eternal Fire" "block.simple_creator.test_block": "Fast jumpy wooly diamond-dropping block of Eternal Fire"
} }