Skip to content

Commit

Permalink
Merge pull request #106 from HerobrineFR/dev
Browse files Browse the repository at this point in the history
Push Dev to master
  • Loading branch information
Inposa authored Feb 1, 2025
2 parents 83e88ca + e6a14bf commit 9dcd5a5
Show file tree
Hide file tree
Showing 1,007 changed files with 3,125 additions and 4,090 deletions.
88 changes: 58 additions & 30 deletions assets/herobrine/font/gui.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,58 @@
{"providers":[
{
"file":"herobrine:gui/blank_menu.png",
"chars":[""],
"height":170,
"ascent":47,
"type":"bitmap"
},
{
"file":"herobrine:icons/icon_right_blue.png",
"chars":["x"],
"height":16,
"ascent":-80,
"type":"bitmap"
},
{
"file":"herobrine:icons/icon_left_blue.png",
"chars":["g"],
"height":16,
"ascent":-80,
"type":"bitmap"
},
{
"file":"herobrine:icons/hb_logo.png",
"chars":["l"],
"height":16,
"ascent":-80,
"type":"bitmap"
}
]}
{
"providers": [
{
"file": "herobrine:gui/blank_menu.png",
"chars": [
""
],
"height": 170,
"ascent": 47,
"type": "bitmap"
},
{
"file": "herobrine:gui/crafting.png",
"chars": [
"c"
],
"height": 170,
"ascent": 47,
"type": "bitmap"
},
{
"file": "herobrine:gui/cooking.png",
"chars": [
"s"
],
"height": 170,
"ascent": 47,
"type": "bitmap"
},
{
"file": "herobrine:icons/icon_right_blue.png",
"chars": [
"x"
],
"height": 16,
"ascent": -80,
"type": "bitmap"
},
{
"file": "herobrine:icons/icon_left_blue.png",
"chars": [
"g"
],
"height": 16,
"ascent": -80,
"type": "bitmap"
},
{
"file": "herobrine:icons/hb_logo.png",
"chars": [
"l"
],
"height": 16,
"ascent": -80,
"type": "bitmap"
}
]
}
Binary file modified assets/herobrine/textures/entity/shield/protecteurs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
type=item
matchItems=paper
items=paper
texture=clapclap
components.custom_data={animations:clapclap}
components.custom_data.animations=clapclap

# /give @s paper[custom_data={animations:clapclap}]
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
type=item
matchItems=paper
items=paper
texture=kneel
components.custom_data={animations:kneel}
components.custom_data.animations=kneel

# /give @s paper[custom_data={animations:kneel}]
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
type=item
matchItems=diamond_sword
model=optifine/cit/source_models/2xhand
items=diamond_sword
texture=broken_fire_claymore
components.custom_data.relique=broken_fire_claymore
model=optifine/cit/source_models/2xhand
components.custom_data.relique=broken_fire_claymore

# /give @s diamond_sword[custom_data={relique:broken_fire_claymore}]
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
type=item
matchItems=diamond_sword
model=optifine/cit/source_models/2xhand
items=diamond_sword
texture=dead_fire_claymore
model=optifine/cit/source_models/2xhand
components.custom_data.relique=dead_fire_claymore

# /give @s diamond_sword[custom_data={relique:dead_fire_claymore}]
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
type=item
matchItems=diamond_sword
model=optifine/cit/source_models/2xhand
items=diamond_sword
texture=fire_claymore
components.custom_data.relique=fire_claymore
model=optifine/cit/source_models/2xhand
components.custom_data.relique=fire_claymore

# /give @s diamond_sword[custom_data={relique:fire_claymore}]
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
type=elytra
matchItems=elytra
items=elytra
texture=npc_s
components.custom_data.npc=npc_s
components.custom_data.npc=npc_s

# /give @s elytra[custom_data={npc:npc_s}]
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
type=armor
matchItems=chainmail_boots
items=chainmail_boots
texture.chainmail_layer_1=chainmail_layer_1
texture.chainmail_layer_2=chainmail_layer_2
components.custom_data.vanilla=armure_maille

# /give @s chainmail_boots[custom_data=[custom_data={vanilla:armure_maille}]]
# /give @s chainmail_boots[custom_data={vanilla:armure_maille}]
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
type=armor
matchItems=chainmail_helmet
items=chainmail_helmet
texture.chainmail_layer_1=chainmail_layer_1
texture.chainmail_layer_2=chainmail_layer_2
components.custom_data.vanilla=armure_maille
components.custom_data.vanilla=armure_maille

# /give @s chainmail_helmet[custom_data={vanilla:armure_maille}]
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
type=armor
matchItems=chainmail_leggings
items=chainmail_leggings
texture.chainmail_layer_1=chainmail_layer_1
texture.chainmail_layer_2=chainmail_layer_2
components.custom_data.vanilla=armure_maille
components.custom_data.vanilla=armure_maille

# /give @s chainmail_leggings[custom_data={vanilla:armure_maille}]
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
type=armor
matchItems=chainmail_chestplate
items=chainmail_chestplate
texture.chainmail_layer_1=chainmail_layer_1
texture.chainmail_layer_2=chainmail_layer_1
components.custom_data.vanilla=armure_maille
components.custom_data.vanilla=armure_maille

# /give @s chainmail_chestplate[custom_data={vanilla:armure_maille}]
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
type=armor
matchItems=chainmail_boots
items=chainmail_boots
texture.chainmail_layer_1=vide1
texture.chainmail_layer_2=vide2
components.custom_data.armure=void
components.custom_data.armure=void

# /give @s chainmail_boots[custom_data={armure:void}]
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
type=armor
matchItems=chainmail_helmet
items=chainmail_helmet
texture.chainmail_layer_1=vide1
texture.chainmail_layer_2=vide2
components.custom_data.armure=void
components.custom_data.armure=void

# /give @s chainmail_helmet[custom_data={armure:void}]
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
type=armor
matchItems=chainmail_leggings
items=chainmail_leggings
texture.chainmail_layer_1=vide1
texture.chainmail_layer_2=vide2
components.custom_data.armure=void
components.custom_data.armure=void

# /give @s chainmail_leggings[custom_data={armure:void}]
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
type=armor
matchItems=chainmail_chestplate
items=chainmail_chestplate
texture.chainmail_layer_1=vide1
texture.chainmail_layer_2=vide2
components.custom_data.armure=void
components.custom_data.armure=void

# /give @s chainmail_chestplate[custom_data={armure:void}]
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
type=item
matchItems=minecraft:redstone_torch
items=redstone_torch
texture=red_torch_void
components.custom_data.autre=void
components.custom_data.autre=void

# /give @s redstone_torch[custom_data={autre:void}]
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
type=item
matchItems=minecraft:torch
items=torch
texture=torch_void
components.custom_data.autre=void
components.custom_data.autre=void

# /give @s torch[custom_data={autre:void}]
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
type=item
matchItems=gold_nugget
items=gold_nugget
texture=bague_or
components.custom_data.artisanat_bijoutier=bague_or
components.custom_data.artisanat_bijoutier=bague_or

# /give @s gold_nugget[custom_data={artisanat_bijoutier:bague_or}]
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
type=item
matchItems=gold_nugget
items=gold_nugget
texture=pendentif_or
components.custom_data.artisanat_bijoutier=pendentif_or
components.custom_data.artisanat_bijoutier=pendentif_or

# /give @s gold_nugget[custom_data={artisanat_bijoutier:pendentif_or}]
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
type=item
matchItems=iron_ingot
items=iron_ingot
texture=broyeur
components.custom_data.artisanat_bijoutier=broyeur
components.custom_data.artisanat_bijoutier=broyeur

# /give @s iron_ingot[custom_data={artisanat_bijoutier:broyeur}]
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
type=item
matchItems=minecraft:lapis_lazuli
items=lapis_lazuli
texture=broyeur_diamant
components.custom_data.artisanat_bijoutier=broyeur_diamant
components.custom_data.artisanat_bijoutier=broyeur_diamant

# /give @s lapis_lazuli[custom_data={artisanat_bijoutier:broyeur_diamant}]
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
type=item
matchItems=diamond
items=diamond
texture=diamantaille
components.custom_data.gemme=diamanttaille

# /give @s diamond[custom_data={gemme:diamanttaille}]
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
type=item
matchItems=diamond
items=diamond
texture=diamantpur
components.custom_data.gemme=diamantpur

# /give @s diamond[custom_data={gemme:diamantpur}]
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
type=item
matchItems=emerald
items=emerald
texture=emeraudepure
components.custom_data.gemme=emeraudepure

# /give @s emerald[custom_data={gemme:emeraudepure}]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
type=item
matchItems=diamond
items=diamond
texture=rubis
components.custom_data.gemme=rubis


# /give @s diamond[custom_data={gemme:rubis}]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
type=item
matchItems=diamond
items=diamond
texture=saphir
components.custom_data.gemme=saphir


# /give @s diamond[custom_data={gemme:saphir}]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
type=item
matchItems=diamond
items=diamond
texture=agate_violette
components.custom_data.gemme=agate_violette


# /give @s diamond[custom_data={gemme:agate_violette}]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
type=item
matchItems=diamond
items=diamond
texture=aiguemarine
components.custom_data.gemme=aiguemarine


# /give @s diamond[custom_data={gemme:aiguemarine}]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
type=item
matchItems=diamond
items=diamond
texture=ambre
components.custom_data.gemme=ambre


# /give @s diamond[custom_data={gemme:ambre}]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
type=item
matchItems=diamond
items=diamond
texture=amethyste
components.custom_data.gemme=amethyste


# /give @s diamond[custom_data={gemme:amethyste}]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
type=item
matchItems=diamond
items=diamond
texture=citrine
components.custom_data.gemme=citrine


# /give @s diamond[custom_data={gemme:citrine}]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
type=item
matchItems=diamond
items=diamond
texture=cornaline
components.custom_data.gemme=cornaline


# /give @s diamond[custom_data={gemme:cornaline}]
Loading

0 comments on commit 9dcd5a5

Please sign in to comment.