Skip to content

Commit

Permalink
Version 1.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Hye0Ngit committed Feb 26, 2022
1 parent 13eca81 commit f323511
Show file tree
Hide file tree
Showing 131 changed files with 1,416 additions and 90 deletions.
15 changes: 8 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.8-SNAPSHOT'
id 'fabric-loom' version '0.11-SNAPSHOT'
id 'maven-publish'
}

Expand Down Expand Up @@ -68,12 +68,13 @@ publishing {
publications {
mavenJava(MavenPublication) {
// add all the jars that should be included when publishing to maven
artifact(remapJar) {
builtBy remapJar
}
artifact(sourcesJar) {
builtBy remapSourcesJar
}
//artifact(remapJar) {
// builtBy remapJar
//}
//artifact(sourcesJar) {
// builtBy remapSourcesJar
//}
from components.java
}
}

Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ org.gradle.jvmargs=-Xmx4G -Xmn3G
# Fabric Properties
# check these on https://fabricmc.net/versions.html
minecraft_version=1.17.1
yarn_mappings=1.17.1+build.23
loader_version=0.11.6
yarn_mappings=1.17.1+build.65
loader_version=0.13.2

# Mod Properties
mod_version = 1.2.2
mod_version = 1.2.3
maven_group = kr.kro.yewonmods.ymetallib
archives_base_name = yewonmods-ymetallib

# Dependencies
fabric_version=0.37.0+1.17
fabric_version=0.46.1+1.17
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
287 changes: 215 additions & 72 deletions src/main/java/kr/kro/yewonmods/ymetallib/Main.java

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions src/main/java/kr/kro/yewonmods/ymetallib/mixins/YMLibMixin.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package kr.kro.yewonmods.ymetallib.mixins;

import net.minecraft.client.gui.screen.TitleScreen;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(TitleScreen.class)
public class YMLibMixin {
@Inject(at = @At("HEAD"), method = "init()V")
private void init(CallbackInfo info) {
System.out.println("YMetalLib Mixin Loaded");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "ymetallib:block/andesite_tungsten_ore" }
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "ymetallib:block/deepslate_tungsten_ore" }
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "ymetallib:block/diorite_tungsten_ore" }
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "ymetallib:block/end_tungsten_ore" }
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "ymetallib:block/granite_tungsten_ore" }
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "ymetallib:block/nether_tungsten_ore" }
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "ymetallib:block/tungsten_block" }
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "ymetallib:block/tungsten_ore" }
}
}
24 changes: 24 additions & 0 deletions src/main/resources/assets/ymetallib/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
{
"item.ymetallib.tin_can" : "Empty Tin Can",
"item.ymetallib.air" : "Tin Can containing Air",
"item.ymetallib.sulfuric_acid_tin_can" : "Tin Can containing 1 Bucket Amount of Sulfuric Acid",
"item.ymetallib.water_tin_can_one_third" : "Tin Can containing 1/3 Bucket Amount of Water",
"item.ymetallib.water_tin_can_two_third" : "Tin Can containing 2/3 Bucket Amount of Water",
"item.ymetallib.water_tin_can" : "Tin Can containing 1 Bucket Amount of Water",
"item.ymetallib.lava_tin_can_one_third" : "Tin Can containing 1/3 Bucket Amount of Lava",
"item.ymetallib.lava_tin_can_two_third" : "Tin Can containing 2/3 Bucket Amount of Lava",
"item.ymetallib.lava_tin_can" : "Tin Can containing 1 Bucket Amount of Lava",
"item.ymetallib.hammer" : "Hammer",
"item.ymetallib.wrench" : "Wrench",
"item.ymetallib.tin_ingot" : "Tin Ingot",
Expand All @@ -12,6 +21,7 @@
"item.ymetallib.steel_ingot" : "Steel Ingot",
"item.ymetallib.aluminum_ingot" : "Aluminum Ingot",
"item.ymetallib.titanium_ingot" : "Titanium Ingot",
"item.ymetallib.tungsten_ingot" : "Tungsten Ingot",
"item.ymetallib.copper_nugget" : "Copper Nugget",
"item.ymetallib.tin_nugget" : "Tin Nugget",
"item.ymetallib.bronze_nugget" : "Bronze Nugget",
Expand All @@ -24,6 +34,7 @@
"item.ymetallib.steel_nugget" : "Steel Nugget",
"item.ymetallib.aluminum_nugget" : "Aluminum Nugget",
"item.ymetallib.titanium_nugget" : "Titanium Nugget",
"item.ymetallib.tungsten_nugget" : "Tungsten Nugget",
"item.ymetallib.copper_dust" : "Copper Dust",
"item.ymetallib.tin_dust" : "Tin Dust",
"item.ymetallib.bronze_dust" : "Bronze Dust",
Expand All @@ -36,15 +47,19 @@
"item.ymetallib.steel_dust" : "Steel Dust",
"item.ymetallib.aluminum_dust" : "Aluminum Dust",
"item.ymetallib.titanium_dust" : "Titanium Dust",
"item.ymetallib.tungsten_dust" : "Tungsten Dust",
"item.ymetallib.iron_dust" : "Iron Dust",
"item.ymetallib.gold_dust" : "Gold Dust",
"item.ymetallib.carbon_dust" : "Carbon Dust",
"item.ymetallib.sulfur_dust" : "Sulfur Dust",
"item.ymetallib.bronze_mixture" : "Bronze Mixture",
"item.ymetallib.invar_mixture" : "Invar Mixture",
"item.ymetallib.electrum_mixture" : "Electrum Mixture",
"item.ymetallib.steel_mixture" : "High Carbon Iron Mixture",
"item.ymetallib.aluminum_mixture" : "Bauxite Dust",
"item.ymetallib.titanium_mixture" : "Rutile Dust",
"item.ymetallib.tungsten_mixture" : "Wolframite Dust",
"item.ymetallib.acidic_tungsten_mixture" : "Acidified Wolframite Dust",
"item.ymetallib.bronze_plate" : "Bronze Plate",
"item.ymetallib.steel_plate" : "Steel Plate",
"item.ymetallib.copper_plate" : "Copper Plate",
Expand All @@ -57,6 +72,7 @@
"item.ymetallib.electrum_plate" : "Electrum Plate",
"item.ymetallib.aluminum_plate" : "Aluminum Plate",
"item.ymetallib.titanium_plate" : "Titanium Plate",
"item.ymetallib.tungsten_plate" : "Tungsten Plate",
"item.ymetallib.iron_plate" : "Iron Plate",
"item.ymetallib.gold_plate" : "Gold Plate",
"block.ymetallib.tin_block" : "Tin Block",
Expand All @@ -70,54 +86,62 @@
"block.ymetallib.steel_block" : "Steel Block",
"block.ymetallib.aluminum_block" : "Aluminum Block",
"block.ymetallib.titanium_block" : "Titanium Block",
"block.ymetallib.tungsten_block" : "Tungsten Block",
"block.ymetallib.tin_ore" : "Tin Ore",
"block.ymetallib.lead_ore" : "Lead Ore",
"block.ymetallib.silver_ore" : "Silver Ore",
"block.ymetallib.platinum_ore" : "Platinum Ore",
"block.ymetallib.nickel_ore" : "Nickel Ore",
"block.ymetallib.aluminum_ore" : "Bauxite Ore",
"block.ymetallib.titanium_ore" : "Rutile Ore",
"block.ymetallib.tungsten_ore" : "Wolframite Ore",
"block.ymetallib.deepslate_tin_ore" : "Deepslate Tin Ore",
"block.ymetallib.deepslate_lead_ore" : "Deepslate Lead Ore",
"block.ymetallib.deepslate_silver_ore" : "Deepslate Silver Ore",
"block.ymetallib.deepslate_platinum_ore" : "Deepslate Platinum Ore",
"block.ymetallib.deepslate_nickel_ore" : "Deepslate Nickel Ore",
"block.ymetallib.deepslate_aluminum_ore" : "Deepslate Bauxite Ore",
"block.ymetallib.deepslate_titanium_ore" : "Deepslate Rutile Ore",
"block.ymetallib.deepslate_tungsten_ore" : "Deepslate Wolframite Ore",
"block.ymetallib.diorite_tin_ore" : "Diorite Tin Ore",
"block.ymetallib.diorite_lead_ore" : "Diorite Lead Ore",
"block.ymetallib.diorite_silver_ore" : "Diorite Silver Ore",
"block.ymetallib.diorite_platinum_ore" : "Diorite Platinum Ore",
"block.ymetallib.diorite_nickel_ore" : "Diorite Nickel Ore",
"block.ymetallib.diorite_aluminum_ore" : "Diorite Bauxite Ore",
"block.ymetallib.diorite_titanium_ore" : "Diorite Rutile Ore",
"block.ymetallib.diorite_tungsten_ore" : "Diorite Wolframite Ore",
"block.ymetallib.granite_tin_ore" : "Granite Tin Ore",
"block.ymetallib.granite_lead_ore" : "Granite Lead Ore",
"block.ymetallib.granite_silver_ore" : "Granite Silver Ore",
"block.ymetallib.granite_platinum_ore" : "Granite Platinum Ore",
"block.ymetallib.granite_nickel_ore" : "Granite Nickel Ore",
"block.ymetallib.granite_aluminum_ore" : "Granite Bauxite Ore",
"block.ymetallib.granite_titanium_ore" : "Granite Rutile Ore",
"block.ymetallib.granite_tungsten_ore" : "Granite Wolframite Ore",
"block.ymetallib.andesite_tin_ore" : "Andesite Tin Ore",
"block.ymetallib.andesite_lead_ore" : "Andesite Lead Ore",
"block.ymetallib.andesite_silver_ore" : "Andesite Silver Ore",
"block.ymetallib.andesite_platinum_ore" : "Andesite Platinum Ore",
"block.ymetallib.andesite_nickel_ore" : "Andesite Nickel Ore",
"block.ymetallib.andesite_aluminum_ore" : "Andesite Bauxite Ore",
"block.ymetallib.andesite_titanium_ore" : "Andesite Rutile Ore",
"block.ymetallib.andesite_tungsten_ore" : "Andesite Wolframite Ore",
"block.ymetallib.nether_tin_ore" : "Nether Tin Ore",
"block.ymetallib.nether_lead_ore" : "Nether Lead Ore",
"block.ymetallib.nether_silver_ore" : "Nether Silver Ore",
"block.ymetallib.nether_platinum_ore" : "Nether Platinum Ore",
"block.ymetallib.nether_nickel_ore" : "Nether Nickel Ore",
"block.ymetallib.nether_aluminum_ore" : "Nether Bauxite Ore",
"block.ymetallib.nether_titanium_ore" : "Nether Rutile Ore",
"block.ymetallib.nether_tungsten_ore" : "Nether Wolframite Ore",
"block.ymetallib.end_tin_ore" : "End Tin Ore",
"block.ymetallib.end_lead_ore" : "End Lead Ore",
"block.ymetallib.end_silver_ore" : "End Silver Ore",
"block.ymetallib.end_platinum_ore" : "End Platinum Ore",
"block.ymetallib.end_nickel_ore" : "End Nickel Ore",
"block.ymetallib.end_aluminum_ore" : "End Bauxite Ore",
"block.ymetallib.end_titanium_ore" : "End Rutile Ore",
"block.ymetallib.end_tungsten_ore" : "End Wolframite Ore",
"itemGroup.ymetallib.ymetallib_group" : "YMetalLib"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ymetallib:block/andesite_tungsten_ore"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ymetallib:block/deepslate_tungsten_ore"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ymetallib:block/diorite_tungsten_ore"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ymetallib:block/end_tungsten_ore"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ymetallib:block/granite_tungsten_ore"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ymetallib:block/nether_tungsten_ore"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ymetallib:block/tungsten_block"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ymetallib:block/tungsten_ore"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ymetallib:item/acidic_tungsten_mixture"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/ymetallib/models/item/air.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ymetallib:item/air"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "ymetallib:block/andesite_tungsten_ore"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "ymetallib:block/deepslate_tungsten_ore"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "ymetallib:block/diorite_tungsten_ore"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "ymetallib:block/end_tungsten_ore"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "ymetallib:block/granite_tungsten_ore"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ymetallib:item/lava_tin_can"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ymetallib:item/lava_tin_can_one_third"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ymetallib:item/lava_tin_can_two_third"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "ymetallib:block/nether_tungsten_ore"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ymetallib:item/sulfur_dust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ymetallib:item/sulfuric_acid_tin_can"
}
}
Loading

0 comments on commit f323511

Please sign in to comment.