Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updated to latest mappings of forge, fixed a lang issue that occured #294

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

updated to latest mappings of forge, fixed a lang issue that occured #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ba6d15
updated mappings to stable_39
Ukaye-dev Apr 24, 2019
8471217
fixed errors, and some lang things
Ukaye-dev Apr 24, 2019
607616a
more land fixes
Ukaye-dev Apr 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ targetCompat = JavaVersion.VERSION_1_8
minecraft {
version = "1.12-14.21.1.2404"
runDir = "run"
mappings = "snapshot_20170708"
mappings = "stable_39"
makeObfSourceJar = false
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Tue May 16 17:06:48 EEST 2017
#Wed Apr 24 07:11:59 CDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/baubles/api/IBauble.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public interface IBauble {
public default void onWornTick(ItemStack itemstack, EntityLivingBase player) {
}

String getUnlocalizedName(ItemStack par1ItemStack);

/**
* This method is called when the bauble is equipped by a player
*/
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/baubles/api/cap/BaubleItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,9 @@ public BaubleItem(BaubleType type) {
public BaubleType getBaubleType(ItemStack itemstack) {
return baubleType;
}

@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {
return null;
}
}
4 changes: 2 additions & 2 deletions src/main/java/baubles/common/items/ItemRing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public ItemRing()

@SubscribeEvent
public static void registerItems(RegistryEvent.Register<Item> event) {
event.getRegistry().register((new ItemRing()).setUnlocalizedName("Ring").setRegistryName("ring"));
event.getRegistry().register((new ItemRing()).setTranslationKey("Ring").setRegistryName("ring"));
}

@Override
Expand Down Expand Up @@ -93,7 +93,7 @@ public EnumRarity getRarity(ItemStack par1ItemStack) {
@Override
public String getUnlocalizedName(ItemStack par1ItemStack)
{
return super.getUnlocalizedName() + "." + par1ItemStack.getItemDamage();
return super.getTranslationKey() + "." + par1ItemStack.getItemDamage();
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/ar_sa.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=خاتم التعدين
item.Ring.name=خاتم التعدين
#
# GUI
button.normal=عادى
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/bg_bg.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=Пръстенът на миньора
item.Ring.name=Пръстенът на миньора
#
# GUI
button.baubles=Дрънкулки
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/cs_cz.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=Horníkův prsten
item.Ring.name=Horníkův prsten
#
# GUI
button.baubles=Cetky
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/da_dk.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#
# ITEMS
item.Ring.0.name=Minearbejders Ring
item.Ring.name=Minearbejders Ring
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/de_de.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=Bergarbeiterring
item.Ring.name=Bergarbeiterring
#
# GUI
button.baubles=Baubles
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/el_gr.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=Δαχτυλίδι Μεταλλωρύχου
item.Ring.name=Δαχτυλίδι Μεταλλωρύχου
#
# GUI
button.baubles=Μπιχλιμπίδια
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/en_us.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=Miner's Ring
item.Ring.name=Miner's Ring
#
# GUI
button.baubles=Baubles
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/es_es.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=Anillo de Minero
item.Ring.name=Anillo de Minero
#
# GUI
button.baubles=Ornamentos
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/et_ee.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Translated by tambre

# ITEMS
item.Ring.0.name=Kaevandaja sõrmus
item.Ring.name=Kaevandaja sõrmus

# GUI
button.baubles=Baublid
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/fi_fi.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#
# ITEMS
item.Ring.0.name=Kaivosmiehen Sormus
item.Ring.name=Kaivosmiehen Sormus
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/fr_ca.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=Anneau de mineur
item.Ring.name=Anneau de mineur
#
# GUI
button.baubles=Bébelles
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/fr_fr.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=Anneau du mineur
item.Ring.name=Anneau du mineur
#
# GUI
button.baubles=Bibelots
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/it_it.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=Anello del minatore
item.Ring.name=Anello del minatore
#
# GUI
button.baubles=Accessori
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/ko_kr.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=광부의 반지
item.Ring.name=광부의 반지
#
# GUI
button.baubles=버블즈
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/nl_nl.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=Mijnwerkers Ring
item.Ring.name=Mijnwerkers Ring
#
# GUI
button.baubles=Baubles
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/no_no.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=Gruvearbeiders Ring
item.Ring.name=Gruvearbeiders Ring
#
# GUI
button.baubles=Smykker
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/pl_pl.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=Pierścień Górnika
item.Ring.name=Pierścień Górnika
#
# GUI
button.baubles=Baubles
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/pt_br.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=Anel do Minerador
item.Ring.name=Anel do Minerador
#
# GUI
button.baubles=Baubles
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/ru_ru.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=Кольцо шахтёра
item.Ring.name=Кольцо шахтёра
#
# GUI
button.baubles=Baubles
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/tr_tr.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=Madenci'nin Yüzüğü
item.Ring.name=Madenci'nin Yüzüğü
#
# GUI
button.baubles=Baubles
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/uk_ua.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Речі
item.Ring.0.name=Перстень шахтаря
item.Ring.name=Перстень шахтаря
#
# GUI
button.baubles=Baubles
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/zh_cn.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=矿工指环
item.Ring.name=矿工指环
#
# GUI
button.baubles=饰品
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/baubles/lang/zh_tw.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# ITEMS
item.Ring.0.name=礦工戒指
item.Ring.name=礦工戒指
#
# GUI
button.baubles=配件裝備欄
Expand Down