Skip to content

Commit 9444afd

Browse files
CrystalwarriorCrystalwarrior
authored
Refactor armors to be mods rather than hardcoded into API (#78)
* Begin work on "armors as modpack" refactor letting anyone to enable/disable any armors they want as mods rather than obscure settings * Fix some steel armor mishaps, remove pointless dependency on "default" * Move admin armor into mod * Make wood armor into a mod * More consistent steel description text etc. * remove wood references from 3d_armor api locale * remove admin armor reference from 3d_armor locale template.txt * Remove steel textures from api * Bronze armor as mod * Fix admin, wood armor missing local S translator var Fix wood locale missing template.txt * Fix bronze missing locale * Cactus as mod * Crystal into mod * Diamond into mod * Mithril and Gold as mods * Register armor fix * Nether as mod * Clean-up, add optional depends for mod armors, remove armor.lua from 3d_armor * Fix badly named mod.conf for admin, gold, nether armors Fix attempt to register crafting recipe even though the armor is disabled via setting * Fix steel and wood having bad globals for crafting section, turned them to locals * Fix brazilian translation getting deleted Fix cactus armor locales being incorrectly named
1 parent e1a262b commit 9444afd

File tree

273 files changed

+2827
-1469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

273 files changed

+2827
-1469
lines changed

‎3d_armor/armor.lua

Lines changed: 0 additions & 1027 deletions
This file was deleted.

‎3d_armor/depends.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ ethereal?
77
bakedclay?
88
moreores?
99
nether?
10+
3d_armor_steel?

‎3d_armor/init.lua

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,7 @@ for _, mod in pairs(skin_mods) do
9999
armor.set_skin_mod(mod)
100100
end
101101
end
102-
if not minetest.get_modpath("moreores") then
103-
armor.materials.mithril = nil
104-
end
105-
if not minetest.get_modpath("ethereal") then
106-
armor.materials.crystal = nil
107-
end
108-
if not minetest.get_modpath("nether") then
109-
armor.materials.nether = nil
110-
end
111102

112-
dofile(modpath.."/armor.lua")
113103

114104
-- Armor Initialization
115105

‎3d_armor/locale/3d_armor.de.tr

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,6 @@
77
3d_armor: Player name is nil @1=3d_armor : Spielername ist nicht gesetzt: @1
88
3d_armor: Player reference is nil @1=3d_armor : Spielerreferenz ist nicht gesetzt: @1
99

10-
### armor.lua ###
11-
12-
Admin Boots=Adminstiefel
13-
Admin Chestplate=Adminbrustplatte
14-
Admin Helmet=Adminhelm
15-
Admin Leggings=Adminhose
16-
Bronze Boots=Bronzestiefel
17-
Bronze Chestplate=Bronzebrustplatte
18-
Bronze Helmet=Bronzehelm
19-
Bronze Leggings=Bronzehose
20-
Cactus Boots=Kaktusstiefel
21-
Cactus Chestplate=Kaktusbrustplatte
22-
Cactus Helmet=Kaktushelm
23-
Cactus Leggings=Kaktushose
24-
Crystal Boots=Kristallstiefel
25-
Crystal Chestplate=Kristallbrustplatte
26-
Crystal Helmet=Kristallhelm
27-
Crystal Leggings=Kristallhose
28-
Nether Boots=Netherstiefel
29-
Nether Chestplate=Netherbrustplatte
30-
Nether Helmet=Netherhelm
31-
Nether Leggings=Netherhose
32-
Diamond Boots=Diamantstiefel
33-
Diamond Chestplate=Diamantbrustplatte
34-
Diamond Helmet=Diamanthelm
35-
Diamond Leggings=Diamanthose
36-
Gold Boots=Goldstiefel
37-
Gold Chestplate=Goldbrustplatte
38-
Gold Helmet=Goldhelm
39-
Gold Leggings=Goldhose
40-
Mithril Boots=Mithrilstiefel
41-
Mithril Chestplate=Mithrilbrustplatte
42-
Mithril Helmet=Mithrilhelm
43-
Mithril Leggings=Mithrilhose
44-
Steel Boots=Stahlstiefel
45-
Steel Chestplate=Stahlbrustplatte
46-
Steel Helmet=Stahlhelm
47-
Steel Leggings=Stahlhose
48-
Wood Boots=Holzstiefel
49-
Wood Chestplate=Holzbrustplatte
50-
Wood Helmet=Holzhelm
51-
Wood Leggings=Holzhose
52-
5310
### init.lua ###
5411

5512
3d_armor: Failed to initialize player=3d_armor : Initialisierung des Spielers fehlgeschlagen

‎3d_armor/locale/3d_armor.es.tr

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,6 @@
77
3d_armor: Player name is nil @1=3d_armor: El nombre del jugador es nulo @1
88
3d_armor: Player reference is nil @1=3d_armor: La referencia del jugador es nula @1
99

10-
### armor.lua ###
11-
12-
Admin Boots=Botas de admin
13-
Admin Chestplate=Peto de admin
14-
Admin Helmet=Casco de admin
15-
Admin Leggings=Grebas de admin
16-
Bronze Boots=Botas de bronce
17-
Bronze Chestplate=Peto de bronce
18-
Bronze Helmet=Casco de bronce
19-
Bronze Leggings=Grebas de bronce
20-
Cactus Boots=Botas de cactus
21-
Cactus Chestplate=Peto de cactus
22-
Cactus Helmet=Casco de cactus
23-
Cactus Leggings=Grebas de cactus
24-
Crystal Boots=Botas de cristal
25-
Crystal Chestplate=Peto de cristal
26-
Crystal Helmet=Casco de cristal
27-
Crystal Leggings=Grebas de cristal
28-
Nether Boots=Botas de nether
29-
Nether Chestplate=Peto de nether
30-
Nether Helmet=Casco de nether
31-
Nether Leggings=Grebas de nether
32-
Diamond Boots=Botas de diamante
33-
Diamond Chestplate=Peto de diamante
34-
Diamond Helmet=Casco de diamante
35-
Diamond Leggings=Grebas de diamante
36-
Gold Boots=Botas de oro
37-
Gold Chestplate=Peto de oro
38-
Gold Helmet=Casco de oro
39-
Gold Leggings=Grebas de oro
40-
Mithril Boots=Botas de mitrilo
41-
Mithril Chestplate=Peto de mitrilo
42-
Mithril Helmet=Casco de mitrilo
43-
Mithril Leggings=Grebas de mitrilo
44-
Steel Boots=Botas de acero
45-
Steel Chestplate=Peto de acero
46-
Steel Helmet=Casco de acero
47-
Steel Leggings=Grebas de acero
48-
Wood Boots=Botas de madera
49-
Wood Chestplate=Peto de madera
50-
Wood Helmet=Casco de madera
51-
Wood Leggings=Grebas de madera
52-
5310
### init.lua ###
5411

5512
3d_armor: Failed to initialize player=3d_armor: Fallo en la inicialización del jugador

‎3d_armor/locale/3d_armor.fr.tr

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,6 @@
77
3d_armor: Player name is nil @1=3d_armor : Nom du joueur non trouvé @1
88
3d_armor: Player reference is nil @1=3d_armor : Référence au joueur non trouvée @1
99

10-
### armor.lua ###
11-
12-
Admin Boots=Bottes d'admin
13-
Admin Chestplate=Cuirasse d'admin
14-
Admin Helmet=Casque d'admin
15-
Admin Leggings=Jambières d'admin
16-
Bronze Boots=Bottes en bronze
17-
Bronze Chestplate=Cuirasse en bronze
18-
Bronze Helmet=Casque en bronze
19-
Bronze Leggings=Jambières en bronze
20-
Cactus Boots=Bottes en cactus
21-
Cactus Chestplate=Cuirasse en cactus
22-
Cactus Helmet=Casque en cactus
23-
Cactus Leggings=Jambières en cactus
24-
Crystal Boots=Bottes en cristal
25-
Crystal Chestplate=Cuirasse en cristal
26-
Crystal Helmet=Casque en cristal
27-
Crystal Leggings=Jambières en cristal
28-
Nether Boots=Bottes en nether
29-
Nether Chestplate=Cuirasse en nether
30-
Nether Helmet=Casque en nether
31-
Nether Leggings=Jambières en nether
32-
Diamond Boots=Bottes en diamant
33-
Diamond Chestplate=Cuirasse en diamant
34-
Diamond Helmet=Casque en diamant
35-
Diamond Leggings=Jambières en diamant
36-
Gold Boots=Bottes en or
37-
Gold Chestplate=Cuirasse en or
38-
Gold Helmet=Casque en or
39-
Gold Leggings=Jambières en or
40-
Mithril Boots=Bottes en mithril
41-
Mithril Chestplate=Cuirasse en mithril
42-
Mithril Helmet=Casque en mithril
43-
Mithril Leggings=Jambières en mithril
44-
Steel Boots=Bottes en acier
45-
Steel Chestplate=Cuirasse en acier
46-
Steel Helmet=Casque en acier
47-
Steel Leggings=Jambières en acier
48-
Wood Boots=Bottes en bois
49-
Wood Chestplate=Cuirasse en bois
50-
Wood Helmet=Casque en bois
51-
Wood Leggings=Jambières en bois
52-
5310
### init.lua ###
5411

5512
3d_armor: Failed to initialize player=3d_armor : Impossible d'initialiser le joueur

‎3d_armor/locale/3d_armor.it.tr

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,6 @@
77
3d_armor: Player name is nil @1=3d_armor: Il nome dell'utente è nullo @1
88
3d_armor: Player reference is nil @1=3d_armor: Il riferimento all'utente è nullo @1
99

10-
### armor.lua ###
11-
12-
Admin Boots=Stivali dell'amministratrice/tore
13-
Admin Chestplate=Corazza dell'amministratrice/tore
14-
Admin Helmet=Elmo dell'amministratrice/tore
15-
Admin Leggings=Gambali dell'amministratrice/tore
16-
Bronze Boots=Stivali di bronzo
17-
Bronze Chestplate=Corazza di bronzo
18-
Bronze Helmet=Elmo di bronzo
19-
Bronze Leggings=Gambali di bronzo
20-
Cactus Boots=Stivali di cactus
21-
Cactus Chestplate=Corazza di cactus
22-
Cactus Helmet=Elmo di cactus
23-
Cactus Leggings=Gambali di cactus
24-
Crystal Boots=Stivali di cristallo
25-
Crystal Chestplate=Corazza di cristallo
26-
Crystal Helmet=Elmo di cristallo
27-
Crystal Leggings=Gambali di cristallo
28-
Nether Boots=Stivali di nether
29-
Nether Chestplate=Corazza di nether
30-
Nether Helmet=Elmo di nether
31-
Nether Leggings=Gambali di nether
32-
Diamond Boots=Stivali di diamante
33-
Diamond Chestplate=Corazza di diamante
34-
Diamond Helmet=Elmo di diamante
35-
Diamond Leggings=Gambali di diamante
36-
Gold Boots=Stivali d'oro
37-
Gold Chestplate=Corazza d'oro
38-
Gold Helmet=Elmo d'oro
39-
Gold Leggings=Gambali d'oro
40-
Mithril Boots=Stivali di mithril
41-
Mithril Chestplate=Corazza di mithril
42-
Mithril Helmet=Elmo di mithril
43-
Mithril Leggings=Gambali di mithril
44-
Steel Boots=Stivali d'acciaio
45-
Steel Chestplate=Corazza d'acciaio
46-
Steel Helmet=Elmo d'acciaio
47-
Steel Leggings=Gambali d'acciaio
48-
Wood Boots=Stivali di legno
49-
Wood Chestplate=Corazza di legno
50-
Wood Helmet=Elmo di legno
51-
Wood Leggings=Gambali di legno
52-
5310
### init.lua ###
5411

5512
3d_armor: Failed to initialize player=3d_armor: Inizializzazione dell'utente fallita

‎3d_armor/locale/3d_armor.ms.tr

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,6 @@
77
3d_armor: Player name is nil @1=3d_armor: Nama pemain tiada nilai @1
88
3d_armor: Player reference is nil @1=3d_armor: Rujukan pemain tiada nilai @1
99

10-
### armor.lua ###
11-
12-
Admin Boots=But Pentadbir
13-
Admin Chestplate=Perisai Dada Pentadbir
14-
Admin Helmet=Helmet Pentadbir
15-
Admin Leggings=Perisai Kaki Pentadbir
16-
Bronze Boots=But Gangsa
17-
Bronze Chestplate=Perisai Dada Gangsa
18-
Bronze Helmet=Helmet Gangsa
19-
Bronze Leggings=Perisai Kaki Gangsa
20-
Cactus Boots=But Kaktus
21-
Cactus Chestplate=Perisai Dada Kaktus
22-
Cactus Helmet=Helmet Kaktus
23-
Cactus Leggings=Perisai Kaki Kaktus
24-
Crystal Boots=But Kristal
25-
Crystal Chestplate=Perisai Dada Kristal
26-
Crystal Helmet=Helmet Kristal
27-
Crystal Leggings=Perisai Kaki Kristal
28-
Nether Boots=But Nether
29-
Nether Chestplate=Perisai Dada Nether
30-
Nether Helmet=Helmet Nether
31-
Nether Leggings=Perisai Kaki Nether
32-
Diamond Boots=But Intan
33-
Diamond Chestplate=Perisai Dada Intan
34-
Diamond Helmet=Helmet Intan
35-
Diamond Leggings=Perisai Kaki Intan
36-
Gold Boots=But Emas
37-
Gold Chestplate=Perisai Dada Emas
38-
Gold Helmet=Helmet Emas
39-
Gold Leggings=Perisai Kaki Emas
40-
Mithril Boots=But Mithril
41-
Mithril Chestplate=Perisai Dada Mithril
42-
Mithril Helmet=Helmet Mithril
43-
Mithril Leggings=Perisai Kaki Mithril
44-
Steel Boots=But Keluli
45-
Steel Chestplate=Perisai Dada Keluli
46-
Steel Helmet=Helmet Keluli
47-
Steel Leggings=Perisai Kaki Keluli
48-
Wood Boots=But Kayu
49-
Wood Chestplate=Perisai Dada Kayu
50-
Wood Helmet=Helmet Kayu
51-
Wood Leggings=Perisai Kaki Kayu
52-
5310
### init.lua ###
5411

5512
3d_armor: Failed to initialize player=3d_armor: Gagal mengasalkan pemain

‎3d_armor/locale/3d_armor.pt.tr

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,6 @@
77
3d_armor: Player name is nil @1=3d_armor: Nome de jogador é nulo @1
88
3d_armor: Player reference is nil @1=3d_armor: Referência Jogador é nula @1
99

10-
### armor.lua ###
11-
12-
Admin Boots=Botas de Administrador
13-
Admin Chestplate=Peitoral de Administrador
14-
Admin Helmet=Capacete de Administrador
15-
Admin Leggings=Calças de Administrador
16-
Bronze Boots=Botas de Bronze
17-
Bronze Chestplate=Peitoral de Bronze
18-
Bronze Helmet=Capacete de Bronze
19-
Bronze Leggings=Calças de Bronze
20-
Cactus Boots=Botas de Madeira
21-
Cactus Chestplate=Peitoral de Cacto
22-
Cactus Helmet=Capacete de Cacto
23-
Cactus Leggings=Calças de Cacto
24-
Crystal Boots=Botas de Cristal
25-
Crystal Chestplate=Peitoral de Cristal
26-
Crystal Helmet=Capacete de Cristal
27-
Crystal Leggings=Calças de Cristal
28-
Nether Boots=Botas de Nether
29-
Nether Chestplate=Peitoral de Nether
30-
Nether Helmet=Capacete de Nether
31-
Nether Leggings=Calças de Nether
32-
Diamond Boots=Botas de Diamante
33-
Diamond Chestplate=Peitoral de Diamante
34-
Diamond Helmet=Capacete de Diamante
35-
Diamond Leggings=Calças de Diamante
36-
Gold Boots=Botas de Ouro
37-
Gold Chestplate=Peitoral de Ouro
38-
Gold Helmet=Capacete de Ouro
39-
Gold Leggings=Calças de Ouro
40-
Mithril Boots=Botas de Mithril
41-
Mithril Chestplate=Peitoral de Mithril
42-
Mithril Helmet=Capacete de Mithril
43-
Mithril Leggings=Calças de Mithril
44-
Steel Boots=Botas de Aço
45-
Steel Chestplate=Peitoral de Aço
46-
Steel Helmet=Capacete de Aço
47-
Steel Leggings=Calças de Aço
48-
Wood Boots=Botas de Madeira
49-
Wood Chestplate=Peitoral de Madeira
50-
Wood Helmet=Capacete de Madeira
51-
Wood Leggings=Calças de Madeira
52-
5310
### init.lua ###
5411

5512
3d_armor: Failed to initialize player=3d_armor: Falha ao inicializar jogador

‎3d_armor/locale/3d_armor.pt_BR.tr

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,6 @@
77
3d_armor: Player name is nil @1=3d_armor: Nome de jogador é nulo @1
88
3d_armor: Player reference is nil @1=3d_armor: Referência Jogador é nula @1
99

10-
### armor.lua ###
11-
12-
Admin Boots=Botas de Administrador
13-
Admin Chestplate=Peitoral de Administrador
14-
Admin Helmet=Capacete de Administrador
15-
Admin Leggings=Calças de Administrador
16-
Bronze Boots=Botas de Bronze
17-
Bronze Chestplate=Peitoral de Bronze
18-
Bronze Helmet=Capacete de Bronze
19-
Bronze Leggings=Calças de Bronze
20-
Cactus Boots=Botas de Madeira
21-
Cactus Chestplate=Peitoral de Cacto
22-
Cactus Helmet=Capacete de Cacto
23-
Cactus Leggings=Calças de Cacto
24-
Crystal Boots=Botas de Cristal
25-
Crystal Chestplate=Peitoral de Cristal
26-
Crystal Helmet=Capacete de Cristal
27-
Crystal Leggings=Calças de Cristal
28-
Nether Boots=Botas de Nether
29-
Nether Chestplate=Peitoral de Nether
30-
Nether Helmet=Capacete de Nether
31-
Nether Leggings=Calças de Nether
32-
Diamond Boots=Botas de Diamante
33-
Diamond Chestplate=Peitoral de Diamante
34-
Diamond Helmet=Capacete de Diamante
35-
Diamond Leggings=Calças de Diamante
36-
Gold Boots=Botas de Ouro
37-
Gold Chestplate=Peitoral de Ouro
38-
Gold Helmet=Capacete de Ouro
39-
Gold Leggings=Calças de Ouro
40-
Mithril Boots=Botas de Mithril
41-
Mithril Chestplate=Peitoral de Mithril
42-
Mithril Helmet=Capacete de Mithril
43-
Mithril Leggings=Calças de Mithril
44-
Steel Boots=Botas de Aço
45-
Steel Chestplate=Peitoral de Aço
46-
Steel Helmet=Capacete de Aço
47-
Steel Leggings=Calças de Aço
48-
Wood Boots=Botas de Madeira
49-
Wood Chestplate=Peitoral de Madeira
50-
Wood Helmet=Capacete de Madeira
51-
Wood Leggings=Calças de Madeira
52-
5310
### init.lua ###
5411

5512
3d_armor: Failed to initialize player=3d_armor: Falha ao inicializar jogador

0 commit comments

Comments
 (0)