diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ca3795..a445d59 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ # against bad commits. name: build -on: [pull_request, push] +on: [ pull_request, push ] jobs: build: @@ -12,29 +12,26 @@ jobs: matrix: # Use these Java versions java: [ - 17, # Current Java LTS & minimum supported by Minecraft + 21, # Current Java LTS ] - # and run on both Linux and Windows - os: [ubuntu-22.04, windows-2022] - runs-on: ${{ matrix.os }} + runs-on: ubuntu-22.04 steps: - name: checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: validate gradle wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@v2 - name: setup jdk ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'microsoft' - name: make gradle wrapper executable - if: ${{ runner.os != 'Windows' }} run: chmod +x ./gradlew - name: build run: ./gradlew build - name: capture build artifacts - if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS - uses: actions/upload-artifact@v3 + if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java + uses: actions/upload-artifact@v4 with: name: Artifacts path: build/libs/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 1425a6c..cbd517b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,91 +1,88 @@ plugins { - id 'fabric-loom' version '1.4-SNAPSHOT' - id 'maven-publish' + id 'fabric-loom' version '1.7-SNAPSHOT' + id 'maven-publish' } version = project.mod_version group = project.maven_group base { - archivesName = project.archives_base_name + archivesName = project.archives_base_name } repositories { - // Add repositories to retrieve artifacts from in here. - // You should only use this when depending on other mods because - // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. - // See https://docs.gradle.org/current/userguide/declaring_repositories.html - // for more information about repositories. + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. } loom { splitEnvironmentSourceSets() - mods { - "modid" { - sourceSet sourceSets.main - sourceSet sourceSets.client - } - } + mods { + "modid" { + sourceSet sourceSets.main + sourceSet sourceSets.client + } + } } dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - - // 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. - - // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + } processResources { - inputs.property "version", project.version + inputs.property "version", project.version - filesMatching("fabric.mod.json") { - expand "version": project.version - } + filesMatching("fabric.mod.json") { + expand "version": project.version + } } tasks.withType(JavaCompile).configureEach { - it.options.release = 17 + it.options.release = 21 } java { - // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task - // if it is present. - // If you remove this line, sources will not be generated. - withSourcesJar() + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } jar { - from("LICENSE") { - rename { "${it}_${project.base.archivesName.get()}"} - } + from("LICENSE") { + rename { "${it}_${project.base.archivesName.get()}" } + } } // configure the maven publication publishing { - publications { - mavenJava(MavenPublication) { - from components.java - } - } - - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. - repositories { - // Add repositories to publish to here. - // Notice: This block does NOT have the same function as the block in the top level. - // The repositories here will be used for publishing your artifact, not for - // retrieving dependencies. - } -} + publications { + create("mavenJava", MavenPublication) { + artifactId = project.archives_base_name + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index f9ca6a1..118f3e8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,14 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G org.gradle.parallel=true - # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.2 -yarn_mappings=1.20.2+build.1 -loader_version=0.14.22 - +minecraft_version=1.21.1 +yarn_mappings=1.21.1+build.3 +loader_version=0.16.5 # Mod Properties -mod_version=1.7.0 +mod_version=2.0.0 maven_group=rs.onako2 archives_base_name=i-want-it-earlier - # Dependencies -fabric_version=0.89.1+1.20.2 +fabric_version=0.105.0+1.21.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 033e24c..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ac72c34..09523c0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index fcb6fca..b26d411 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -83,7 +85,9 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -144,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -201,11 +205,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -245,4 +249,4 @@ eval "set -- $( tr '\n' ' ' )" '"$@"' -exec "$JAVACMD" "$@" +exec "$JAVACMD" "$@" \ No newline at end of file diff --git a/gradlew.bat b/gradlew.bat index 6689b85..b808aea 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -89,4 +91,4 @@ exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal -:omega +:omega \ No newline at end of file diff --git a/src/client/java/rs/onako2/ClientInit.java b/src/client/java/rs/onako2/ClientInit.java index 2069408..35b7cc9 100644 --- a/src/client/java/rs/onako2/ClientInit.java +++ b/src/client/java/rs/onako2/ClientInit.java @@ -1,16 +1,9 @@ package rs.onako2; import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; -import net.minecraft.client.render.RenderLayer; public class ClientInit implements ClientModInitializer { - @Override - public void onInitializeClient() { - BlockRenderLayerMap.INSTANCE.putBlock(Init.COPPER_GRID, RenderLayer.getCutout()); - BlockRenderLayerMap.INSTANCE.putBlock(Init.EXPOSED_COPPER_GRID, RenderLayer.getCutout()); - BlockRenderLayerMap.INSTANCE.putBlock(Init.OXIDIZED_COPPER_GRID, RenderLayer.getCutout()); - BlockRenderLayerMap.INSTANCE.putBlock(Init.WEATHERED_COPPER_GRID, RenderLayer.getCutout()); - BlockRenderLayerMap.INSTANCE.putBlock(Init.TRIAL_SPAWNER, RenderLayer.getCutout()); - } + @Override + public void onInitializeClient() { + } } \ No newline at end of file diff --git a/src/main/java/rs/onako2/Init.java b/src/main/java/rs/onako2/Init.java index 510495d..ba5021f 100644 --- a/src/main/java/rs/onako2/Init.java +++ b/src/main/java/rs/onako2/Init.java @@ -1,150 +1,44 @@ package rs.onako2; import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; - +import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; -import net.minecraft.item.BlockItem; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.text.Text; import net.minecraft.util.Identifier; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class Init implements ModInitializer { - // This logger is used to write text to the console and the log file. - // It is considered best practice to use your mod id as the logger's name. - // That way, it's clear which mod wrote info, warnings, and errors. - public static final Logger LOGGER = LoggerFactory.getLogger("iwie"); - - public static final Block TEST = new Block(FabricBlockSettings.create().strength(4.0f)); - - public static final Block OXIDIZED_COPPER_BULB = new Block(FabricBlockSettings.create().strength(4.0f).luminance(3).requiresTool()); - - public static final Block WEATHERED_COPPER_BULB = new Block(FabricBlockSettings.create().strength(4.0f).luminance(7).requiresTool()); - - public static final Block EXPOSED_COPPER_BULB = new Block(FabricBlockSettings.create().strength(4.0f).luminance(11).requiresTool()); - - public static final Block CHISELED_TUFF_BRICKS = new Block(FabricBlockSettings.create().strength(4.0f).requiresTool()); - - public static final Block COPPER_BULB = new Block(FabricBlockSettings.create().strength(4.0f).luminance(15).requiresTool()); - - public static final Block COPPER_GRID = new Block(FabricBlockSettings.create().nonOpaque().strength(4.0f).requiresTool()); - - public static final Block WEATHERED_COPPER_GRID = new Block(FabricBlockSettings.create().nonOpaque().strength(4.0f).requiresTool()); - - public static final Block EXPOSED_COPPER_GRID = new Block(FabricBlockSettings.create().nonOpaque().strength(4.0f).requiresTool()); - - public static final Block OXIDIZED_COPPER_GRID = new Block(FabricBlockSettings.create().nonOpaque().strength(4.0f).requiresTool()); - - public static final Block TRIAL_SPAWNER = new Block(FabricBlockSettings.create().nonOpaque().strength(4.0f).luminance(8)); - - public static final Block TUFF_BRICKS = new Block(FabricBlockSettings.create().strength(4.0f).requiresTool()); - - public static final Block CHISELED_COPPER = new Block(FabricBlockSettings.create().strength(4.0f).requiresTool()); - - public static final Block EXPOSED_CHISELED_COPPER = new Block(FabricBlockSettings.create().strength(4.0f).requiresTool()); - - public static final Block WEATHERED_CHISELED_COPPER = new Block(FabricBlockSettings.create().strength(4.0f).requiresTool()); - - public static final Block OXIDIZED_CHISELED_COPPER = new Block(FabricBlockSettings.create().strength(4.0f).requiresTool()); - - public static final Block POLISHED_CHISELED_TUFF = new Block(FabricBlockSettings.create().strength(4.0f).requiresTool()); + // This logger is used to write text to the console and the log file. + // It is considered best practice to use your mod id as the logger's name. + // That way, it's clear which mod wrote info, warnings, and errors. + public static final Logger LOGGER = LoggerFactory.getLogger("iwie"); - public static final Block POLISHED_TUFF = new Block(FabricBlockSettings.create().strength(4.0f).requiresTool()); + public static final Block TEST = new Block(AbstractBlock.Settings.create().strength(4.0f)); - private static final ItemGroup IWIE = FabricItemGroup.builder() - .icon(() -> new ItemStack(TEST)) - .displayName(Text.translatable("itemGroup.iwie.main")) + private static final ItemGroup IWIE = FabricItemGroup.builder() + .icon(() -> new ItemStack(TEST)) + .displayName(Text.translatable("itemGroup.iwie.main")) .entries((context, entries) -> { - entries.add(OXIDIZED_COPPER_BULB); - entries.add(WEATHERED_COPPER_BULB); - entries.add(EXPOSED_COPPER_BULB); - entries.add(COPPER_BULB); - entries.add(OXIDIZED_COPPER_GRID); - entries.add(WEATHERED_COPPER_GRID); - entries.add(EXPOSED_COPPER_GRID); - entries.add(COPPER_GRID); - entries.add(TUFF_BRICKS); - entries.add(POLISHED_TUFF); - entries.add(CHISELED_TUFF_BRICKS); - entries.add(POLISHED_CHISELED_TUFF); - entries.add(OXIDIZED_CHISELED_COPPER); - entries.add(WEATHERED_CHISELED_COPPER); - entries.add(EXPOSED_CHISELED_COPPER); - entries.add(CHISELED_COPPER); - entries.add(TRIAL_SPAWNER); - }) - .build(); - - - @Override - public void onInitialize() { - - LOGGER.info("Initializing items and blocks from 1.21 update!"); - - Registry.register(Registries.ITEM_GROUP, new Identifier("iwie", "main"), IWIE); - - Registry.register(Registries.BLOCK, new Identifier("iwie", "test"), TEST); - Registry.register(Registries.ITEM, new Identifier("iwie", "test"), new BlockItem(TEST, new FabricItemSettings())); - - Registry.register(Registries.BLOCK, new Identifier("iwie", "oxidized_copper_bulb"), OXIDIZED_COPPER_BULB); - Registry.register(Registries.ITEM, new Identifier("iwie", "oxidized_copper_bulb"), new BlockItem(OXIDIZED_COPPER_BULB, new FabricItemSettings())); - - Registry.register(Registries.BLOCK, new Identifier("iwie", "weathered_copper_bulb"), WEATHERED_COPPER_BULB); - Registry.register(Registries.ITEM, new Identifier("iwie", "weathered_copper_bulb"), new BlockItem(WEATHERED_COPPER_BULB, new FabricItemSettings())); - - Registry.register(Registries.BLOCK, new Identifier("iwie", "exposed_copper_bulb"), EXPOSED_COPPER_BULB); - Registry.register(Registries.ITEM, new Identifier("iwie", "exposed_copper_bulb"), new BlockItem(EXPOSED_COPPER_BULB, new FabricItemSettings())); - - Registry.register(Registries.BLOCK, new Identifier("iwie", "chiseled_tuff_bricks"), CHISELED_TUFF_BRICKS); - Registry.register(Registries.ITEM, new Identifier("iwie", "chiseled_tuff_bricks"), new BlockItem(CHISELED_TUFF_BRICKS, new FabricItemSettings())); - - Registry.register(Registries.BLOCK, new Identifier("iwie", "copper_bulb"), COPPER_BULB); - Registry.register(Registries.ITEM, new Identifier("iwie", "copper_bulb"), new BlockItem(COPPER_BULB, new FabricItemSettings())); - - Registry.register(Registries.BLOCK, new Identifier("iwie", "copper_grid"), COPPER_GRID); - Registry.register(Registries.ITEM, new Identifier("iwie", "copper_grid"), new BlockItem(COPPER_GRID, new FabricItemSettings())); - - Registry.register(Registries.BLOCK, new Identifier("iwie", "exposed_copper_grid"), EXPOSED_COPPER_GRID); - Registry.register(Registries.ITEM, new Identifier("iwie", "exposed_copper_grid"), new BlockItem(EXPOSED_COPPER_GRID, new FabricItemSettings())); - - Registry.register(Registries.BLOCK, new Identifier("iwie", "oxidized_copper_grid"), OXIDIZED_COPPER_GRID); - Registry.register(Registries.ITEM, new Identifier("iwie", "oxidized_copper_grid"), new BlockItem(OXIDIZED_COPPER_GRID, new FabricItemSettings())); - - Registry.register(Registries.BLOCK, new Identifier("iwie", "weathered_copper_grid"), WEATHERED_COPPER_GRID); - Registry.register(Registries.ITEM, new Identifier("iwie", "weathered_copper_grid"), new BlockItem(WEATHERED_COPPER_GRID, new FabricItemSettings())); - - Registry.register(Registries.BLOCK, new Identifier("iwie", "tuff_bricks"), TUFF_BRICKS); - Registry.register(Registries.ITEM, new Identifier("iwie", "tuff_bricks"), new BlockItem(TUFF_BRICKS, new FabricItemSettings())); - - Registry.register(Registries.BLOCK, new Identifier("iwie", "polished_tuff"), POLISHED_TUFF); - Registry.register(Registries.ITEM, new Identifier("iwie", "polished_tuff"), new BlockItem(POLISHED_TUFF, new FabricItemSettings())); - - Registry.register(Registries.BLOCK, new Identifier("iwie", "polished_chiseled_tuff"), POLISHED_CHISELED_TUFF); - Registry.register(Registries.ITEM, new Identifier("iwie", "polished_chiseled_tuff"), new BlockItem(POLISHED_CHISELED_TUFF, new FabricItemSettings())); + entries.add(TEST); + }) + .build(); - Registry.register(Registries.BLOCK, new Identifier("iwie", "chiseled_copper"), CHISELED_COPPER); - Registry.register(Registries.ITEM, new Identifier("iwie", "chiseled_copper"), new BlockItem(CHISELED_COPPER, new FabricItemSettings())); - Registry.register(Registries.BLOCK, new Identifier("iwie", "exposed_chiseled_copper"), EXPOSED_CHISELED_COPPER); - Registry.register(Registries.ITEM, new Identifier("iwie", "exposed_chiseled_copper"), new BlockItem(EXPOSED_CHISELED_COPPER, new FabricItemSettings())); + @Override + public void onInitialize() { - Registry.register(Registries.BLOCK, new Identifier("iwie", "weathered_chiseled_copper"), WEATHERED_CHISELED_COPPER); - Registry.register(Registries.ITEM, new Identifier("iwie", "weathered_chiseled_copper"), new BlockItem(WEATHERED_CHISELED_COPPER, new FabricItemSettings())); + LOGGER.info("Initializing items and blocks from 1.22 update!"); - Registry.register(Registries.BLOCK, new Identifier("iwie", "oxidized_chiseled_copper"), OXIDIZED_CHISELED_COPPER); - Registry.register(Registries.ITEM, new Identifier("iwie", "oxidized_chiseled_copper"), new BlockItem(OXIDIZED_CHISELED_COPPER, new FabricItemSettings())); + Registry.register(Registries.ITEM_GROUP, Identifier.of("iwie", "main"), IWIE); - Registry.register(Registries.BLOCK, new Identifier("iwie", "trial_spawner"), TRIAL_SPAWNER); - Registry.register(Registries.ITEM, new Identifier("iwie", "trial_spawner"), new BlockItem(TRIAL_SPAWNER, new FabricItemSettings())); - - } + ModRegistry.registerBlocks(); + ModRegistry.registerItems(); + } } diff --git a/src/main/java/rs/onako2/ModRegistry.java b/src/main/java/rs/onako2/ModRegistry.java new file mode 100644 index 0000000..60f5c1b --- /dev/null +++ b/src/main/java/rs/onako2/ModRegistry.java @@ -0,0 +1,16 @@ +package rs.onako2; + +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.registry.Registries; +import net.minecraft.util.Identifier; + +public class ModRegistry { + public static void registerItems() { + net.minecraft.registry.Registry.register(Registries.ITEM, Identifier.of("iwie", "test"), new BlockItem(Init.TEST, new Item.Settings())); + } + + public static void registerBlocks() { + net.minecraft.registry.Registry.register(Registries.BLOCK, Identifier.of("iwie", "test"), Init.TEST); + } +} diff --git a/src/main/java/rs/onako2/Util.java b/src/main/java/rs/onako2/Util.java new file mode 100644 index 0000000..2351ce4 --- /dev/null +++ b/src/main/java/rs/onako2/Util.java @@ -0,0 +1,17 @@ +package rs.onako2; + +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.block.MapColor; +import net.minecraft.block.PillarBlock; +import net.minecraft.block.enums.NoteBlockInstrument; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.math.Direction; + +public class Util { + public static Block createLogBlock(MapColor topMapColor, MapColor sideMapColor) { + return new PillarBlock(AbstractBlock.Settings.create().mapColor((state) -> { + return state.get(PillarBlock.AXIS) == Direction.Axis.Y ? topMapColor : sideMapColor; + }).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).burnable()); + } +} diff --git a/src/main/resources/assets/iwie/blockstates/chiseled_copper.json b/src/main/resources/assets/iwie/blockstates/chiseled_copper.json deleted file mode 100644 index 8866f36..0000000 --- a/src/main/resources/assets/iwie/blockstates/chiseled_copper.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "iwie:block/chiseled_copper" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/blockstates/chiseled_tuff_bricks.json b/src/main/resources/assets/iwie/blockstates/chiseled_tuff_bricks.json deleted file mode 100644 index e9e1326..0000000 --- a/src/main/resources/assets/iwie/blockstates/chiseled_tuff_bricks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "iwie:block/chiseled_tuff_bricks" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/blockstates/copper_bulb.json b/src/main/resources/assets/iwie/blockstates/copper_bulb.json deleted file mode 100644 index c591425..0000000 --- a/src/main/resources/assets/iwie/blockstates/copper_bulb.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "iwie:block/copper_bulb" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/blockstates/copper_grid.json b/src/main/resources/assets/iwie/blockstates/copper_grid.json deleted file mode 100644 index 94c2e44..0000000 --- a/src/main/resources/assets/iwie/blockstates/copper_grid.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "iwie:block/copper_grid" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/blockstates/exposed_chiseled_copper.json b/src/main/resources/assets/iwie/blockstates/exposed_chiseled_copper.json deleted file mode 100644 index 9fb080f..0000000 --- a/src/main/resources/assets/iwie/blockstates/exposed_chiseled_copper.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "iwie:block/exposed_chiseled_copper" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/blockstates/exposed_copper_bulb.json b/src/main/resources/assets/iwie/blockstates/exposed_copper_bulb.json deleted file mode 100644 index 382d06d..0000000 --- a/src/main/resources/assets/iwie/blockstates/exposed_copper_bulb.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "iwie:block/exposed_copper_bulb" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/blockstates/exposed_copper_grid.json b/src/main/resources/assets/iwie/blockstates/exposed_copper_grid.json deleted file mode 100644 index fc0d95a..0000000 --- a/src/main/resources/assets/iwie/blockstates/exposed_copper_grid.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "iwie:block/exposed_copper_grid" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/blockstates/oxidized_chiseled_copper.json b/src/main/resources/assets/iwie/blockstates/oxidized_chiseled_copper.json deleted file mode 100644 index b668b0e..0000000 --- a/src/main/resources/assets/iwie/blockstates/oxidized_chiseled_copper.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "iwie:block/oxidized_chiseled_copper" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/blockstates/oxidized_copper_bulb.json b/src/main/resources/assets/iwie/blockstates/oxidized_copper_bulb.json deleted file mode 100644 index c97858a..0000000 --- a/src/main/resources/assets/iwie/blockstates/oxidized_copper_bulb.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "iwie:block/oxidized_copper_bulb" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/blockstates/oxidized_copper_grid.json b/src/main/resources/assets/iwie/blockstates/oxidized_copper_grid.json deleted file mode 100644 index d746300..0000000 --- a/src/main/resources/assets/iwie/blockstates/oxidized_copper_grid.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "iwie:block/oxidized_copper_grid" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/blockstates/polished_chiseled_tuff.json b/src/main/resources/assets/iwie/blockstates/polished_chiseled_tuff.json deleted file mode 100644 index 2f6d442..0000000 --- a/src/main/resources/assets/iwie/blockstates/polished_chiseled_tuff.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "iwie:block/polished_chiseled_tuff" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/blockstates/polished_tuff.json b/src/main/resources/assets/iwie/blockstates/polished_tuff.json deleted file mode 100644 index 5486217..0000000 --- a/src/main/resources/assets/iwie/blockstates/polished_tuff.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "iwie:block/polished_tuff" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/blockstates/test.json b/src/main/resources/assets/iwie/blockstates/test.json deleted file mode 100644 index beb7d3e..0000000 --- a/src/main/resources/assets/iwie/blockstates/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "iwie:block/test" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/blockstates/trial_spawner.json b/src/main/resources/assets/iwie/blockstates/trial_spawner.json deleted file mode 100644 index 2f03071..0000000 --- a/src/main/resources/assets/iwie/blockstates/trial_spawner.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "iwie:block/trial_spawner" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/blockstates/tuff_bricks.json b/src/main/resources/assets/iwie/blockstates/tuff_bricks.json deleted file mode 100644 index 01563f5..0000000 --- a/src/main/resources/assets/iwie/blockstates/tuff_bricks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "iwie:block/tuff_bricks" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/blockstates/weathered_chiseled_copper.json b/src/main/resources/assets/iwie/blockstates/weathered_chiseled_copper.json deleted file mode 100644 index 45147c3..0000000 --- a/src/main/resources/assets/iwie/blockstates/weathered_chiseled_copper.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "iwie:block/weathered_chiseled_copper" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/blockstates/weathered_copper_bulb.json b/src/main/resources/assets/iwie/blockstates/weathered_copper_bulb.json deleted file mode 100644 index ed66ad6..0000000 --- a/src/main/resources/assets/iwie/blockstates/weathered_copper_bulb.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "iwie:block/weathered_copper_bulb" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/blockstates/weathered_copper_grid.json b/src/main/resources/assets/iwie/blockstates/weathered_copper_grid.json deleted file mode 100644 index 0153db2..0000000 --- a/src/main/resources/assets/iwie/blockstates/weathered_copper_grid.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "iwie:block/weathered_copper_grid" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/lang/en_us.json b/src/main/resources/assets/iwie/lang/en_us.json index fcd763d..31c7c1c 100644 --- a/src/main/resources/assets/iwie/lang/en_us.json +++ b/src/main/resources/assets/iwie/lang/en_us.json @@ -1,27 +1,4 @@ { - "block.iwie.test": "Test", - - "block.iwie.chiseled_tuff_bricks": "Chiseled Tuff Bricks", - "block.iwie.tuff_bricks": "Tuff Bricks", - "block.iwie.polished_chiseled_tuff": "Polished Chiseled Tuff Bricks", - "block.iwie.polished_tuff": "Polished Tuff", - - "block.iwie.trial_spawner": "Trial Spawner", - - "itemGroup.iwie.main": "I want it earlier!", - - "block.iwie.copper_bulb": "Copper Bulb", - "block.iwie.oxidized_copper_bulb": "Oxidized Copper Bulb", - "block.iwie.weathered_copper_bulb": "Weathered Copper Bulb", - "block.iwie.exposed_copper_bulb": "Exposed Copper Bulb", - - "block.iwie.copper_grid": "Copper Grid", - "block.iwie.oxidized_copper_grid": "Oxidized Copper Grid", - "block.iwie.exposed_copper_grid": "Exposed Copper Grid", - "block.iwie.weathered_copper_grid": "Weathered Copper Grid", - - "block.iwie.oxidized_chiseled_copper": "Oxidized Chiseled Copper", - "block.iwie.exposed_chiseled_copper": "Exposed Chiseled Copper", - "block.iwie.weathered_chiseled_copper": "Weathered Chiseled Copper", - "block.iwie.chiseled_copper": "Chiseled Copper" + "block.iwie.test": "Test", + "itemGroup.iwie.main": "I want it earlier!" } \ No newline at end of file diff --git a/src/main/resources/assets/iwie/lang/ru_ru.json b/src/main/resources/assets/iwie/lang/ru_ru.json index 7185f7b..a80da30 100644 --- a/src/main/resources/assets/iwie/lang/ru_ru.json +++ b/src/main/resources/assets/iwie/lang/ru_ru.json @@ -1,9 +1,4 @@ { - "block.iwie.test": "Тест", - "block.iwie.chiseled_tuff_bricks": "Туфовый кирпич", - "block.iwie.tuff_bricks": "Резной туфовый кирпич ", - "block.iwie.copper_grid": "Медная сетка", - "block.iwie.copper_bulb": "Медная лампочка", - "block.iwie.oxidized_copper_bulb": "Окисленная медная лампочка", - "itemGroup.iwie.main": "I want it earlier!" + "block.iwie.test": "Тест", + "itemGroup.iwie.main": "I want it earlier!" } diff --git a/src/main/resources/assets/iwie/models/block/chiseled_copper.json b/src/main/resources/assets/iwie/models/block/chiseled_copper.json deleted file mode 100644 index 0dfc822..0000000 --- a/src/main/resources/assets/iwie/models/block/chiseled_copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/chiseled_copper" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/block/chiseled_tuff_bricks.json b/src/main/resources/assets/iwie/models/block/chiseled_tuff_bricks.json deleted file mode 100644 index 308461b..0000000 --- a/src/main/resources/assets/iwie/models/block/chiseled_tuff_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/chiseled_tuff_bricks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/block/copper_bulb.json b/src/main/resources/assets/iwie/models/block/copper_bulb.json deleted file mode 100644 index 2c78cc3..0000000 --- a/src/main/resources/assets/iwie/models/block/copper_bulb.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/copper_bulb" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/block/copper_grid.json b/src/main/resources/assets/iwie/models/block/copper_grid.json deleted file mode 100644 index 8390f55..0000000 --- a/src/main/resources/assets/iwie/models/block/copper_grid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/copper_grid" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/block/exposed_chiseled_copper.json b/src/main/resources/assets/iwie/models/block/exposed_chiseled_copper.json deleted file mode 100644 index 242dad6..0000000 --- a/src/main/resources/assets/iwie/models/block/exposed_chiseled_copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/exposed_chiseled_copper" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/block/exposed_copper_bulb.json b/src/main/resources/assets/iwie/models/block/exposed_copper_bulb.json deleted file mode 100644 index 41f2d74..0000000 --- a/src/main/resources/assets/iwie/models/block/exposed_copper_bulb.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/exposed_copper_bulb" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/block/exposed_copper_grid.json b/src/main/resources/assets/iwie/models/block/exposed_copper_grid.json deleted file mode 100644 index 6554740..0000000 --- a/src/main/resources/assets/iwie/models/block/exposed_copper_grid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/exposed_copper_grid" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/block/oxidized_chiseled_copper.json b/src/main/resources/assets/iwie/models/block/oxidized_chiseled_copper.json deleted file mode 100644 index b20503f..0000000 --- a/src/main/resources/assets/iwie/models/block/oxidized_chiseled_copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/oxidized_chiseled_copper" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/block/oxidized_copper_bulb.json b/src/main/resources/assets/iwie/models/block/oxidized_copper_bulb.json deleted file mode 100644 index 31d216a..0000000 --- a/src/main/resources/assets/iwie/models/block/oxidized_copper_bulb.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/oxidized_copper_bulb" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/block/oxidized_copper_grid.json b/src/main/resources/assets/iwie/models/block/oxidized_copper_grid.json deleted file mode 100644 index af02e08..0000000 --- a/src/main/resources/assets/iwie/models/block/oxidized_copper_grid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/oxidized_copper_grid" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/block/polished_chiseled_tuff.json b/src/main/resources/assets/iwie/models/block/polished_chiseled_tuff.json deleted file mode 100644 index c38a886..0000000 --- a/src/main/resources/assets/iwie/models/block/polished_chiseled_tuff.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "iwie:block/polished_chiseled_tuff_top_buttom", - "side": "iwie:block/polished_chiseled_tuff_sides", - "top": "iwie:block/polished_chiseled_tuff_top_buttom" - } - } \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/block/polished_tuff.json b/src/main/resources/assets/iwie/models/block/polished_tuff.json deleted file mode 100644 index 6a19e4a..0000000 --- a/src/main/resources/assets/iwie/models/block/polished_tuff.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/polished_tuff" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/block/test.json b/src/main/resources/assets/iwie/models/block/test.json deleted file mode 100644 index 74c1044..0000000 --- a/src/main/resources/assets/iwie/models/block/test.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:item/test" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/block/trial_spawner.json b/src/main/resources/assets/iwie/models/block/trial_spawner.json deleted file mode 100644 index 38f4b1f..0000000 --- a/src/main/resources/assets/iwie/models/block/trial_spawner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "iwie:block/trial_spawner_top_bottom", - "side": "iwie:block/trial_spawner_sides", - "top": "iwie:block/trial_spawner_top_bottom" - } - } \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/block/tuff_bricks.json b/src/main/resources/assets/iwie/models/block/tuff_bricks.json deleted file mode 100644 index 4f3b63a..0000000 --- a/src/main/resources/assets/iwie/models/block/tuff_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/tuff_bricks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/block/weathered_chiseled_copper.json b/src/main/resources/assets/iwie/models/block/weathered_chiseled_copper.json deleted file mode 100644 index 0d13f96..0000000 --- a/src/main/resources/assets/iwie/models/block/weathered_chiseled_copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/weathered_chiseled_copper" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/block/weathered_copper_bulb.json b/src/main/resources/assets/iwie/models/block/weathered_copper_bulb.json deleted file mode 100644 index c34c32b..0000000 --- a/src/main/resources/assets/iwie/models/block/weathered_copper_bulb.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/weathered_copper_bulb" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/block/weathered_copper_grid.json b/src/main/resources/assets/iwie/models/block/weathered_copper_grid.json deleted file mode 100644 index 31b478f..0000000 --- a/src/main/resources/assets/iwie/models/block/weathered_copper_grid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/weathered_copper_grid" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/item/chiseled_copper.json b/src/main/resources/assets/iwie/models/item/chiseled_copper.json deleted file mode 100644 index 7fa83f3..0000000 --- a/src/main/resources/assets/iwie/models/item/chiseled_copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/chiseled_copper" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/item/chiseled_tuff_bricks.json b/src/main/resources/assets/iwie/models/item/chiseled_tuff_bricks.json deleted file mode 100644 index 8dc6647..0000000 --- a/src/main/resources/assets/iwie/models/item/chiseled_tuff_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/chiseled_tuff_bricks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/item/copper_bulb.json b/src/main/resources/assets/iwie/models/item/copper_bulb.json deleted file mode 100644 index daa39dd..0000000 --- a/src/main/resources/assets/iwie/models/item/copper_bulb.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/copper_bulb" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/item/copper_grid.json b/src/main/resources/assets/iwie/models/item/copper_grid.json deleted file mode 100644 index dc1fba9..0000000 --- a/src/main/resources/assets/iwie/models/item/copper_grid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/copper_grid" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/item/exposed_chiseled_copper.json b/src/main/resources/assets/iwie/models/item/exposed_chiseled_copper.json deleted file mode 100644 index 7358ff5..0000000 --- a/src/main/resources/assets/iwie/models/item/exposed_chiseled_copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/exposed_chiseled_copper" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/item/exposed_copper_bulb.json b/src/main/resources/assets/iwie/models/item/exposed_copper_bulb.json deleted file mode 100644 index de2bb17..0000000 --- a/src/main/resources/assets/iwie/models/item/exposed_copper_bulb.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/exposed_copper_bulb" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/item/exposed_copper_grid.json b/src/main/resources/assets/iwie/models/item/exposed_copper_grid.json deleted file mode 100644 index c2790f4..0000000 --- a/src/main/resources/assets/iwie/models/item/exposed_copper_grid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/exposed_copper_grid" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/item/oxidized_chiseled_copper.json b/src/main/resources/assets/iwie/models/item/oxidized_chiseled_copper.json deleted file mode 100644 index 4d68f20..0000000 --- a/src/main/resources/assets/iwie/models/item/oxidized_chiseled_copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/oxidized_chiseled_copper" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/item/oxidized_copper_bulb.json b/src/main/resources/assets/iwie/models/item/oxidized_copper_bulb.json deleted file mode 100644 index a2863f1..0000000 --- a/src/main/resources/assets/iwie/models/item/oxidized_copper_bulb.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/oxidized_copper_bulb" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/item/oxidized_copper_grid.json b/src/main/resources/assets/iwie/models/item/oxidized_copper_grid.json deleted file mode 100644 index 5b02ba8..0000000 --- a/src/main/resources/assets/iwie/models/item/oxidized_copper_grid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/oxidized_copper_grid" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/item/polished_chiseled_tuff.json b/src/main/resources/assets/iwie/models/item/polished_chiseled_tuff.json deleted file mode 100644 index 1b53761..0000000 --- a/src/main/resources/assets/iwie/models/item/polished_chiseled_tuff.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "iwie:block/polished_chiseled_tuff_top_buttom", - "side": "iwie:block/polished_chiseled_tuff_sides", - "top": "iwie:block/polished_chiseled_tuff_top_buttom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/item/polished_tuff.json b/src/main/resources/assets/iwie/models/item/polished_tuff.json deleted file mode 100644 index 6a19e4a..0000000 --- a/src/main/resources/assets/iwie/models/item/polished_tuff.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/polished_tuff" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/item/test.json b/src/main/resources/assets/iwie/models/item/test.json deleted file mode 100644 index 63ffeb0..0000000 --- a/src/main/resources/assets/iwie/models/item/test.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "iwie:item/test" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/item/trial_spawner.json b/src/main/resources/assets/iwie/models/item/trial_spawner.json deleted file mode 100644 index cd45ce1..0000000 --- a/src/main/resources/assets/iwie/models/item/trial_spawner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "iwie:block/trial_spawner_top_bottom", - "side": "iwie:block/trial_spawner_sides", - "top": "iwie:block/trial_spawner_top_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/item/tuff_bricks.json b/src/main/resources/assets/iwie/models/item/tuff_bricks.json deleted file mode 100644 index 15a55c5..0000000 --- a/src/main/resources/assets/iwie/models/item/tuff_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/tuff_bricks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/item/weathered_chiseled_copper.json b/src/main/resources/assets/iwie/models/item/weathered_chiseled_copper.json deleted file mode 100644 index 9cc3d6a..0000000 --- a/src/main/resources/assets/iwie/models/item/weathered_chiseled_copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/weathered_chiseled_copper" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/item/weathered_copper_bulb.json b/src/main/resources/assets/iwie/models/item/weathered_copper_bulb.json deleted file mode 100644 index 85ba870..0000000 --- a/src/main/resources/assets/iwie/models/item/weathered_copper_bulb.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/weathered_copper_bulb" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/models/item/weathered_copper_grid.json b/src/main/resources/assets/iwie/models/item/weathered_copper_grid.json deleted file mode 100644 index c438777..0000000 --- a/src/main/resources/assets/iwie/models/item/weathered_copper_grid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "iwie:block/weathered_copper_grid" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/iwie/textures/block/chiseled_copper.png b/src/main/resources/assets/iwie/textures/block/chiseled_copper.png deleted file mode 100644 index 87f2a02..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/chiseled_copper.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/block/chiseled_tuff_bricks.png b/src/main/resources/assets/iwie/textures/block/chiseled_tuff_bricks.png deleted file mode 100644 index acf5d3d..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/chiseled_tuff_bricks.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/block/copper_bulb.png b/src/main/resources/assets/iwie/textures/block/copper_bulb.png deleted file mode 100644 index 6f0ac28..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/copper_bulb.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/block/copper_grid.png b/src/main/resources/assets/iwie/textures/block/copper_grid.png deleted file mode 100644 index 37bc2a5..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/copper_grid.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/block/exposed_chiseled_copper.png b/src/main/resources/assets/iwie/textures/block/exposed_chiseled_copper.png deleted file mode 100644 index 7280320..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/exposed_chiseled_copper.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/block/exposed_copper_bulb.png b/src/main/resources/assets/iwie/textures/block/exposed_copper_bulb.png deleted file mode 100644 index fc9edea..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/exposed_copper_bulb.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/block/exposed_copper_grid.png b/src/main/resources/assets/iwie/textures/block/exposed_copper_grid.png deleted file mode 100644 index a5940a3..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/exposed_copper_grid.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/block/oxidized_chiseled_copper.png b/src/main/resources/assets/iwie/textures/block/oxidized_chiseled_copper.png deleted file mode 100644 index 7a549dc..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/oxidized_chiseled_copper.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/block/oxidized_copper_bulb.png b/src/main/resources/assets/iwie/textures/block/oxidized_copper_bulb.png deleted file mode 100644 index d1caefe..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/oxidized_copper_bulb.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/block/oxidized_copper_grid.png b/src/main/resources/assets/iwie/textures/block/oxidized_copper_grid.png deleted file mode 100644 index 650753f..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/oxidized_copper_grid.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/block/polished_chiseled_tuff_sides.png b/src/main/resources/assets/iwie/textures/block/polished_chiseled_tuff_sides.png deleted file mode 100644 index e92280a..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/polished_chiseled_tuff_sides.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/block/polished_chiseled_tuff_top_buttom.png b/src/main/resources/assets/iwie/textures/block/polished_chiseled_tuff_top_buttom.png deleted file mode 100644 index 0e0b62e..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/polished_chiseled_tuff_top_buttom.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/block/polished_tuff.png b/src/main/resources/assets/iwie/textures/block/polished_tuff.png deleted file mode 100644 index 696befb..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/polished_tuff.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/block/trial_spawner_sides.png b/src/main/resources/assets/iwie/textures/block/trial_spawner_sides.png deleted file mode 100644 index 7e103a2..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/trial_spawner_sides.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/block/trial_spawner_top_bottom.png b/src/main/resources/assets/iwie/textures/block/trial_spawner_top_bottom.png deleted file mode 100644 index 0c518c4..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/trial_spawner_top_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/block/tuff_bricks.png b/src/main/resources/assets/iwie/textures/block/tuff_bricks.png deleted file mode 100644 index 06771de..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/tuff_bricks.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/block/weathered_chiseled_copper.png b/src/main/resources/assets/iwie/textures/block/weathered_chiseled_copper.png deleted file mode 100644 index 3773ab2..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/weathered_chiseled_copper.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/block/weathered_copper_bulb.png b/src/main/resources/assets/iwie/textures/block/weathered_copper_bulb.png deleted file mode 100644 index 26125c3..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/weathered_copper_bulb.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/block/weathered_copper_grid.png b/src/main/resources/assets/iwie/textures/block/weathered_copper_grid.png deleted file mode 100644 index e8ec9fc..0000000 Binary files a/src/main/resources/assets/iwie/textures/block/weathered_copper_grid.png and /dev/null differ diff --git a/src/main/resources/assets/iwie/textures/item/test.png b/src/main/resources/assets/iwie/textures/item/test.png deleted file mode 100644 index e1f4610..0000000 Binary files a/src/main/resources/assets/iwie/textures/item/test.png and /dev/null differ diff --git a/src/main/resources/data/iwie/loot_tables/blocks/chiseled_copper.json b/src/main/resources/data/iwie/loot_tables/blocks/chiseled_copper.json deleted file mode 100644 index 74dcfdb..0000000 --- a/src/main/resources/data/iwie/loot_tables/blocks/chiseled_copper.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "iwie:chiseled_copper" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/loot_tables/blocks/chiseled_tuff_bricks.json b/src/main/resources/data/iwie/loot_tables/blocks/chiseled_tuff_bricks.json deleted file mode 100644 index 8ca009e..0000000 --- a/src/main/resources/data/iwie/loot_tables/blocks/chiseled_tuff_bricks.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "iwie:chiseled_tuff_bricks" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/loot_tables/blocks/copper_bulb.json b/src/main/resources/data/iwie/loot_tables/blocks/copper_bulb.json deleted file mode 100644 index df1a3a0..0000000 --- a/src/main/resources/data/iwie/loot_tables/blocks/copper_bulb.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "iwie:copper_bulb" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/loot_tables/blocks/copper_grid.json b/src/main/resources/data/iwie/loot_tables/blocks/copper_grid.json deleted file mode 100644 index d6a22cb..0000000 --- a/src/main/resources/data/iwie/loot_tables/blocks/copper_grid.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "iwie:copper_grid" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/loot_tables/blocks/exposed_chiseled_copper.json b/src/main/resources/data/iwie/loot_tables/blocks/exposed_chiseled_copper.json deleted file mode 100644 index b32180e..0000000 --- a/src/main/resources/data/iwie/loot_tables/blocks/exposed_chiseled_copper.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "iwie:exposed_chiseled_copper" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/loot_tables/blocks/exposed_copper_bulb.json b/src/main/resources/data/iwie/loot_tables/blocks/exposed_copper_bulb.json deleted file mode 100644 index 9c29731..0000000 --- a/src/main/resources/data/iwie/loot_tables/blocks/exposed_copper_bulb.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "iwie:weathered_copper_bulb" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/loot_tables/blocks/exposed_copper_grid.json b/src/main/resources/data/iwie/loot_tables/blocks/exposed_copper_grid.json deleted file mode 100644 index 0593012..0000000 --- a/src/main/resources/data/iwie/loot_tables/blocks/exposed_copper_grid.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "iwie:weathered_copper_grid" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/loot_tables/blocks/oxidized_chiseled_copper.json b/src/main/resources/data/iwie/loot_tables/blocks/oxidized_chiseled_copper.json deleted file mode 100644 index 45d1dc7..0000000 --- a/src/main/resources/data/iwie/loot_tables/blocks/oxidized_chiseled_copper.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "iwie:oxidized_chiseled_copper" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/loot_tables/blocks/oxidized_copper_bulb.json b/src/main/resources/data/iwie/loot_tables/blocks/oxidized_copper_bulb.json deleted file mode 100644 index 2b31d66..0000000 --- a/src/main/resources/data/iwie/loot_tables/blocks/oxidized_copper_bulb.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "iwie:oxidized_copper_bulb" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/loot_tables/blocks/oxidized_copper_grid.json b/src/main/resources/data/iwie/loot_tables/blocks/oxidized_copper_grid.json deleted file mode 100644 index a7f7baf..0000000 --- a/src/main/resources/data/iwie/loot_tables/blocks/oxidized_copper_grid.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "iwie:oxidized_copper_grid" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/loot_tables/blocks/polished_tuff.json b/src/main/resources/data/iwie/loot_tables/blocks/polished_tuff.json deleted file mode 100644 index 4128815..0000000 --- a/src/main/resources/data/iwie/loot_tables/blocks/polished_tuff.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "iwie:polished_tuff" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/loot_tables/blocks/tial_spawner.json b/src/main/resources/data/iwie/loot_tables/blocks/tial_spawner.json deleted file mode 100644 index b879ccd..0000000 --- a/src/main/resources/data/iwie/loot_tables/blocks/tial_spawner.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "minecraft:block", - "random_sequence": "minecraft:blocks/spawner" -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/loot_tables/blocks/tuff_bricks.json b/src/main/resources/data/iwie/loot_tables/blocks/tuff_bricks.json deleted file mode 100644 index 734ae41..0000000 --- a/src/main/resources/data/iwie/loot_tables/blocks/tuff_bricks.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "iwie:tuff_bricks" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/loot_tables/blocks/weathered_chiseled_copper.json b/src/main/resources/data/iwie/loot_tables/blocks/weathered_chiseled_copper.json deleted file mode 100644 index 2e58e5c..0000000 --- a/src/main/resources/data/iwie/loot_tables/blocks/weathered_chiseled_copper.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "iwie:weathered_chiseled_copper" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/loot_tables/blocks/weathered_copper_bulb.json b/src/main/resources/data/iwie/loot_tables/blocks/weathered_copper_bulb.json deleted file mode 100644 index 9c29731..0000000 --- a/src/main/resources/data/iwie/loot_tables/blocks/weathered_copper_bulb.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "iwie:weathered_copper_bulb" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/loot_tables/blocks/weathered_copper_grid.json b/src/main/resources/data/iwie/loot_tables/blocks/weathered_copper_grid.json deleted file mode 100644 index 0593012..0000000 --- a/src/main/resources/data/iwie/loot_tables/blocks/weathered_copper_grid.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "iwie:weathered_copper_grid" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/chiseled_copper.json b/src/main/resources/data/iwie/recipes/chiseled_copper.json deleted file mode 100644 index bc85e21..0000000 --- a/src/main/resources/data/iwie/recipes/chiseled_copper.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "#": { - "item": "minecraft:cut_copper_slab" - } - }, - "pattern": [ - "#", - "#" - ], - "result": { - "item": "iwie:chiseled_copper" - } -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/chiseled_copper_from_copper_block_stonecutting.json b/src/main/resources/data/iwie/recipes/chiseled_copper_from_copper_block_stonecutting.json deleted file mode 100644 index 88f8110..0000000 --- a/src/main/resources/data/iwie/recipes/chiseled_copper_from_copper_block_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 4, - "ingredient": { - "item": "minecraft:copper_block" - }, - "result": "iwie:chiseled_copper" -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/chiseled_copper_from_cut_copper_stonecutting.json b/src/main/resources/data/iwie/recipes/chiseled_copper_from_cut_copper_stonecutting.json deleted file mode 100644 index 5f5c3e0..0000000 --- a/src/main/resources/data/iwie/recipes/chiseled_copper_from_cut_copper_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "minecraft:cut_copper" - }, - "result": "iwie:chiseled_copper" -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/copper_bulb.json b/src/main/resources/data/iwie/recipes/copper_bulb.json deleted file mode 100644 index 0af3db6..0000000 --- a/src/main/resources/data/iwie/recipes/copper_bulb.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "redstone", - "key": { - "B": { - "item": "minecraft:blaze_rod" - }, - "C": { - "item": "minecraft:copper_block" - }, - "R": { - "item": "minecraft:redstone" - } - }, - "pattern": [ - " C ", - "CBC", - " R " - ], - "result": { - "count": 4, - "item": "iwie:copper_bulb" - } -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/copper_grate.json b/src/main/resources/data/iwie/recipes/copper_grate.json deleted file mode 100644 index f7949c4..0000000 --- a/src/main/resources/data/iwie/recipes/copper_grate.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "M": { - "item": "minecraft:copper_block" - } - }, - "pattern": [ - " M ", - "M M", - " M " - ], - "result": { - "count": 4, - "item": "iwie:copper_grid" - } -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/copper_grate_from_copper_block_stonecutting.json b/src/main/resources/data/iwie/recipes/copper_grate_from_copper_block_stonecutting.json deleted file mode 100644 index 75f571c..0000000 --- a/src/main/resources/data/iwie/recipes/copper_grate_from_copper_block_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 4, - "ingredient": { - "item": "minecraft:copper_block" - }, - "result": "iwie:copper_grid" -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/exposed_chiseled_copper.json b/src/main/resources/data/iwie/recipes/exposed_chiseled_copper.json deleted file mode 100644 index 056a871..0000000 --- a/src/main/resources/data/iwie/recipes/exposed_chiseled_copper.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "#": { - "item": "minecraft:exposed_cut_copper_slab" - } - }, - "pattern": [ - "#", - "#" - ], - "result": { - "item": "iwie:exposed_chiseled_copper" - } -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/exposed_chiseled_copper_from_exposed_copper_stonecutting.json b/src/main/resources/data/iwie/recipes/exposed_chiseled_copper_from_exposed_copper_stonecutting.json deleted file mode 100644 index 4b6fed6..0000000 --- a/src/main/resources/data/iwie/recipes/exposed_chiseled_copper_from_exposed_copper_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 4, - "ingredient": { - "item": "minecraft:exposed_copper" - }, - "result": "iwie:exposed_chiseled_copper" -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/exposed_chiseled_copper_from_exposed_cut_copper_stonecutting.json b/src/main/resources/data/iwie/recipes/exposed_chiseled_copper_from_exposed_cut_copper_stonecutting.json deleted file mode 100644 index fdf0b4d..0000000 --- a/src/main/resources/data/iwie/recipes/exposed_chiseled_copper_from_exposed_cut_copper_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "minecraft:exposed_cut_copper" - }, - "result": "iwie:exposed_chiseled_copper" -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/exposed_copper_bulb.json b/src/main/resources/data/iwie/recipes/exposed_copper_bulb.json deleted file mode 100644 index 9cb92ba..0000000 --- a/src/main/resources/data/iwie/recipes/exposed_copper_bulb.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "redstone", - "key": { - "B": { - "item": "minecraft:blaze_rod" - }, - "C": { - "item": "minecraft:exposed_copper" - }, - "R": { - "item": "minecraft:redstone" - } - }, - "pattern": [ - " C ", - "CBC", - " R " - ], - "result": { - "count": 4, - "item": "iwie:exposed_copper_bulb" - } -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/exposed_copper_grate.json b/src/main/resources/data/iwie/recipes/exposed_copper_grate.json deleted file mode 100644 index f48a36c..0000000 --- a/src/main/resources/data/iwie/recipes/exposed_copper_grate.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "M": { - "item": "minecraft:exposed_copper" - } - }, - "pattern": [ - " M ", - "M M", - " M " - ], - "result": { - "count": 4, - "item": "iwie:exposed_copper_grid" - } -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/exposed_copper_grate_from_exposed_copper_stonecutting.json b/src/main/resources/data/iwie/recipes/exposed_copper_grate_from_exposed_copper_stonecutting.json deleted file mode 100644 index f7c1097..0000000 --- a/src/main/resources/data/iwie/recipes/exposed_copper_grate_from_exposed_copper_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 4, - "ingredient": { - "item": "minecraft:exposed_copper" - }, - "result": "iwie:exposed_copper_grid" -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/oxidized_chiseled_copper_from_oxidized_copper_stonecutting.json b/src/main/resources/data/iwie/recipes/oxidized_chiseled_copper_from_oxidized_copper_stonecutting.json deleted file mode 100644 index 32028f2..0000000 --- a/src/main/resources/data/iwie/recipes/oxidized_chiseled_copper_from_oxidized_copper_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 4, - "ingredient": { - "item": "minecraft:oxidized_copper" - }, - "result": "iwie:oxidized_chiseled_copper" -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/oxidized_chiseled_copper_from_oxidized_cut_copper_stonecutting.json b/src/main/resources/data/iwie/recipes/oxidized_chiseled_copper_from_oxidized_cut_copper_stonecutting.json deleted file mode 100644 index 07f92e9..0000000 --- a/src/main/resources/data/iwie/recipes/oxidized_chiseled_copper_from_oxidized_cut_copper_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "minecraft:oxidized_cut_copper" - }, - "result": "iwie:oxidized_chiseled_copper" -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/oxidized_copper_bulb.json b/src/main/resources/data/iwie/recipes/oxidized_copper_bulb.json deleted file mode 100644 index 2cd3d92..0000000 --- a/src/main/resources/data/iwie/recipes/oxidized_copper_bulb.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "redstone", - "key": { - "B": { - "item": "minecraft:blaze_rod" - }, - "C": { - "item": "minecraft:oxidized_copper" - }, - "R": { - "item": "minecraft:redstone" - } - }, - "pattern": [ - " C ", - "CBC", - " R " - ], - "result": { - "count": 4, - "item": "iwie:oxidized_copper_bulb" - } -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/oxidized_copper_grate.json b/src/main/resources/data/iwie/recipes/oxidized_copper_grate.json deleted file mode 100644 index 496a89d..0000000 --- a/src/main/resources/data/iwie/recipes/oxidized_copper_grate.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "M": { - "item": "minecraft:oxidized_copper" - } - }, - "pattern": [ - " M ", - "M M", - " M " - ], - "result": { - "count": 4, - "item": "iwie:oxidized_copper_grid" - } -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/oxidized_copper_grate_from_oxidized_copper_stonecutting.json b/src/main/resources/data/iwie/recipes/oxidized_copper_grate_from_oxidized_copper_stonecutting.json deleted file mode 100644 index a137de1..0000000 --- a/src/main/resources/data/iwie/recipes/oxidized_copper_grate_from_oxidized_copper_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 4, - "ingredient": { - "item": "minecraft:oxidized_copper" - }, - "result": "iwie:oxidized_copper_grid" -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/polished_tuff.json b/src/main/resources/data/iwie/recipes/polished_tuff.json deleted file mode 100644 index 9424f66..0000000 --- a/src/main/resources/data/iwie/recipes/polished_tuff.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "S": { - "item": "minecraft:tuff" - } - }, - "pattern": [ - "SS", - "SS" - ], - "result": { - "count": 4, - "item": "iwie:polished_tuff" - } -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/polished_tuff_from_tuff_stonecutting.json b/src/main/resources/data/iwie/recipes/polished_tuff_from_tuff_stonecutting.json deleted file mode 100644 index 5d3e4d7..0000000 --- a/src/main/resources/data/iwie/recipes/polished_tuff_from_tuff_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "minecraft:tuff" - }, - "result": "iwie:polished_tuff" -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/tuff_bricks.json b/src/main/resources/data/iwie/recipes/tuff_bricks.json deleted file mode 100644 index 3355a67..0000000 --- a/src/main/resources/data/iwie/recipes/tuff_bricks.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "S": { - "item": "iwie:polished_tuff" - } - }, - "pattern": [ - "SS", - "SS" - ], - "result": { - "count": 4, - "item": "iwie:tuff_bricks" - } -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/weathered_chiseled_copper.json b/src/main/resources/data/iwie/recipes/weathered_chiseled_copper.json deleted file mode 100644 index 2c71bc0..0000000 --- a/src/main/resources/data/iwie/recipes/weathered_chiseled_copper.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "#": { - "item": "minecraft:weathered_cut_copper_slab" - } - }, - "pattern": [ - "#", - "#" - ], - "result": { - "item": "minecraft:weathered_chiseled_copper" - } -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/weathered_chiseled_copper_from_weathered_copper_stonecutting.json b/src/main/resources/data/iwie/recipes/weathered_chiseled_copper_from_weathered_copper_stonecutting.json deleted file mode 100644 index 712b106..0000000 --- a/src/main/resources/data/iwie/recipes/weathered_chiseled_copper_from_weathered_copper_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 4, - "ingredient": { - "item": "minecraft:weathered_copper" - }, - "result": "iwie:weathered_chiseled_copper" -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/weathered_chiseled_copper_from_weathered_cut_copper_stonecutting.json b/src/main/resources/data/iwie/recipes/weathered_chiseled_copper_from_weathered_cut_copper_stonecutting.json deleted file mode 100644 index 50f075c..0000000 --- a/src/main/resources/data/iwie/recipes/weathered_chiseled_copper_from_weathered_cut_copper_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "minecraft:weathered_cut_copper" - }, - "result": "iwie:weathered_chiseled_copper" -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/weathered_copper_bulb.json b/src/main/resources/data/iwie/recipes/weathered_copper_bulb.json deleted file mode 100644 index b3a2b29..0000000 --- a/src/main/resources/data/iwie/recipes/weathered_copper_bulb.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "redstone", - "key": { - "B": { - "item": "minecraft:blaze_rod" - }, - "C": { - "item": "minecraft:weathered_copper" - }, - "R": { - "item": "minecraft:redstone" - } - }, - "pattern": [ - " C ", - "CBC", - " R " - ], - "result": { - "count": 4, - "item": "iwie:weathered_copper_bulb" - } -} \ No newline at end of file diff --git a/src/main/resources/data/iwie/recipes/weathered_copper_grate_from_weathered_copper_stonecutting.json b/src/main/resources/data/iwie/recipes/weathered_copper_grate_from_weathered_copper_stonecutting.json deleted file mode 100644 index 0cafc65..0000000 --- a/src/main/resources/data/iwie/recipes/weathered_copper_grate_from_weathered_copper_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 4, - "ingredient": { - "item": "minecraft:weathered_copper" - }, - "result": "iwie:weathered_copper_grid" -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 1e55b31..a22514f 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -1,21 +1,5 @@ { - "replace": false, - "values": [ - "iwie:chiseled_tuff_bricks", - "iwie:copper_bulb", - "iwie:chiseled_copper", - "iwie:copper_grid", - "iwie:exposed_copper_bulb", - "iwie:exposed_chiseled_copper", - "iwie:exposed_copper_grid", - "iwie:oxidized_copper_bulb", - "iwie:oxidized_chiseled_copper", - "iwie:oxidized_copper_grid", - "iwie:polished_tuff", - "iwie:tuff_bricks", - "iwie:weathered_copper_bulb", - "iwie:weathered_copper_grid", - "iwie:weathered_chiseled_copper", - "iwie:polished_chiseled_tuff" - ] - } \ No newline at end of file + "replace": false, + "values": [ + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json index 12e25be..a22514f 100644 --- a/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json +++ b/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json @@ -1,21 +1,5 @@ { "replace": false, "values": [ - "iwie:chiseled_tuff_bricks", - "iwie:copper_bulb", - "iwie:chiseled_copper", - "iwie:copper_grid", - "iwie:exposed_copper_bulb", - "iwie:exposed_chiseled_copper", - "iwie:exposed_copper_grid", - "iwie:oxidized_copper_bulb", - "iwie:oxidized_chiseled_copper", - "iwie:oxidized_copper_grid", - "iwie:polished_tuff", - "iwie:tuff_bricks", - "iwie:weathered_copper_bulb", - "iwie:weathered_copper_grid", - "iwie:weathered_chiseled_copper", - "iwie:polished_chiseled_tuff" ] } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 6a8b2c9..c6a5673 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,33 +1,33 @@ { - "schemaVersion": 1, - "id": "iwie", - "version": "${version}", - "name": "I want it earlier!", - "description": "This Mod adds items and blocks before they are even in game!", - "authors": [ - "Onako2", - "MrKnowledge" - ], - "contact": { - "homepage": "https://modrinth.com/mod/i-want-it-earlier", - "sources": "https://github.com/Onako2/i-want-it-earlier", - "discord": "https://discord.gg/nFpa776nQk" - }, - "license": "MIT", - "icon": "assets/iwie/icon.png", - "environment": "*", - "entrypoints": { - "main": [ - "rs.onako2.Init" - ], - "client": [ - "rs.onako2.ClientInit" - ] - }, - "depends": { - "fabricloader": ">=0.14.22", - "minecraft": ">=1.20.1", - "java": ">=17", - "fabric-api": ">=0.78" - } + "schemaVersion": 1, + "id": "iwie", + "version": "${version}", + "name": "I want it earlier!", + "description": "This Mod adds items and blocks before they are even in game!", + "authors": [ + "Onako2", + "MrKnowledge" + ], + "contact": { + "homepage": "https://modrinth.com/mod/i-want-it-earlier", + "sources": "https://github.com/Onako2/i-want-it-earlier", + "discord": "https://discord.gg/nFpa776nQk" + }, + "license": "MIT", + "icon": "assets/iwie/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "rs.onako2.Init" + ], + "client": [ + "rs.onako2.ClientInit" + ] + }, + "depends": { + "fabricloader": ">=0.14.22", + "minecraft": ">=1.21.1", + "java": ">=21", + "fabric-api": ">=0.78" + } } \ No newline at end of file