From 99a04d5b438ccad3ee8a40f5181a4986484bb7c8 Mon Sep 17 00:00:00 2001 From: TGGamesYT Date: Tue, 31 Mar 2026 14:00:23 +0200 Subject: [PATCH] get update from school pc since github banned us :( --- gradle.properties | 2 +- .../dev/tggamesyt/szar/EnderObsidian.java | 25 +++++++++ src/main/java/dev/tggamesyt/szar/Szar.java | 34 ++++++++++++ .../szar/blockstates/ender_obsidian.json | 7 +++ .../assets/szar/blockstates/ender_ore.json | 7 +++ .../resources/assets/szar/lang/en_us.json | 6 +- .../szar/models/block/ender_obsidian.json | 6 ++ .../assets/szar/models/block/ender_ore.json | 6 ++ .../assets/szar/models/item/ender_ingot.json | 6 ++ .../szar/models/item/ender_obsidian.json | 3 + .../assets/szar/models/item/ender_ore.json | 3 + .../assets/szar/models/item/raw_ender.json | 6 ++ .../szar/textures/block/crying_obsidian.png | Bin 0 -> 315 bytes .../szar/textures/block/ender_obsidian.png | Bin 0 -> 581 bytes .../assets/szar/textures/block/ender_ore.png | Bin 0 -> 489 bytes .../assets/szar/textures/item/ender_ingot.png | Bin 0 -> 367 bytes .../assets/szar/textures/item/raw_ender.png | Bin 0 -> 441 bytes .../assets/szar/textures/item/raw_ender_1.png | Bin 0 -> 359 bytes .../tags/blocks/mineable/pickaxe.json | 4 +- .../szar/loot_tables/blocks/ender_ore.json | 52 ++++++++++++++++++ .../data/szar/recipes/ender_ingot.json | 9 +++ 21 files changed, 173 insertions(+), 3 deletions(-) create mode 100644 src/main/java/dev/tggamesyt/szar/EnderObsidian.java create mode 100644 src/main/resources/assets/szar/blockstates/ender_obsidian.json create mode 100644 src/main/resources/assets/szar/blockstates/ender_ore.json create mode 100644 src/main/resources/assets/szar/models/block/ender_obsidian.json create mode 100644 src/main/resources/assets/szar/models/block/ender_ore.json create mode 100644 src/main/resources/assets/szar/models/item/ender_ingot.json create mode 100644 src/main/resources/assets/szar/models/item/ender_obsidian.json create mode 100644 src/main/resources/assets/szar/models/item/ender_ore.json create mode 100644 src/main/resources/assets/szar/models/item/raw_ender.json create mode 100644 src/main/resources/assets/szar/textures/block/crying_obsidian.png create mode 100644 src/main/resources/assets/szar/textures/block/ender_obsidian.png create mode 100644 src/main/resources/assets/szar/textures/block/ender_ore.png create mode 100644 src/main/resources/assets/szar/textures/item/ender_ingot.png create mode 100644 src/main/resources/assets/szar/textures/item/raw_ender.png create mode 100644 src/main/resources/assets/szar/textures/item/raw_ender_1.png create mode 100644 src/main/resources/data/szar/loot_tables/blocks/ender_ore.json create mode 100644 src/main/resources/data/szar/recipes/ender_ingot.json diff --git a/gradle.properties b/gradle.properties index 95848ac..61d027f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ minecraft_version=1.20.1 yarn_mappings=1.20.1+build.10 loader_version=0.18.3 # Mod Properties -mod_version=26.3.29.1 +mod_version=26.3.30 maven_group=dev.tggamesyt archives_base_name=szar # Dependencies diff --git a/src/main/java/dev/tggamesyt/szar/EnderObsidian.java b/src/main/java/dev/tggamesyt/szar/EnderObsidian.java new file mode 100644 index 0000000..79c7f6d --- /dev/null +++ b/src/main/java/dev/tggamesyt/szar/EnderObsidian.java @@ -0,0 +1,25 @@ +package dev.tggamesyt.szar; + +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class EnderObsidian extends Block { + + public EnderObsidian(AbstractBlock.Settings settings) { + super(settings); + } + + @Override + public void afterBreak(World world, PlayerEntity player, BlockPos pos, BlockState state, net.minecraft.block.entity.BlockEntity blockEntity, net.minecraft.item.ItemStack stack) { + super.afterBreak(world, player, pos, state, blockEntity, stack); + + if (!world.isClient) { + world.setBlockState(pos, Szar.ENDER_ORE.getDefaultState()); + } + } +} diff --git a/src/main/java/dev/tggamesyt/szar/Szar.java b/src/main/java/dev/tggamesyt/szar/Szar.java index a695894..f8a5f33 100644 --- a/src/main/java/dev/tggamesyt/szar/Szar.java +++ b/src/main/java/dev/tggamesyt/szar/Szar.java @@ -390,6 +390,10 @@ public class Szar implements ModInitializer { entries.add(Szar.CHORUS_ENDSTONE_ITEM); entries.add(Szar.SMALL_CHORUS_ITEM); entries.add(Szar.SMALL_CHORUS_FLOWER_ITEM); + entries.add(Szar.ENDER_OBSIDIAN_ITEM); + entries.add(Szar.ENDER_ORE_ITEM); + entries.add(Szar.RAW_ENDER); + entries.add(Szar.ENDER_INGOT); // blueprint stuff entries.add(BlueprintBlocks.BLUEPRINT); entries.add(BlueprintBlocks.BLUEPRINT_DOOR_ITEM); @@ -1515,6 +1519,36 @@ public class Szar implements ModInitializer { RegistryKeys.BIOME, new Identifier(MOD_ID, "chorus_forest") ); + public static final Block ENDER_OBSIDIAN = Registry.register( + Registries.BLOCK, + new Identifier(MOD_ID, "ender_obsidian"), + new EnderObsidian(FabricBlockSettings.copyOf(Blocks.OBSIDIAN)) + ); + public static final Item ENDER_OBSIDIAN_ITEM = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "ender_obsidian"), + new BlockItem(ENDER_OBSIDIAN, new FabricItemSettings()) + ); + public static final Block ENDER_ORE = Registry.register( + Registries.BLOCK, + new Identifier(MOD_ID, "ender_ore"), + new Block(FabricBlockSettings.copyOf(Blocks.OBSIDIAN)) + ); + public static final Item ENDER_ORE_ITEM = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "ender_ore"), + new BlockItem(ENDER_ORE, new FabricItemSettings()) + ); + public static final Item RAW_ENDER = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "raw_ender"), + new Item(new FabricItemSettings()) + ); + public static final Item ENDER_INGOT = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "ender_ingot"), + new Item(new FabricItemSettings()) + ); // Blocks public static final TrackerBlock TRACKER_BLOCK = Registry.register( Registries.BLOCK, new Identifier(MOD_ID, "tracker"), diff --git a/src/main/resources/assets/szar/blockstates/ender_obsidian.json b/src/main/resources/assets/szar/blockstates/ender_obsidian.json new file mode 100644 index 0000000..d79d28e --- /dev/null +++ b/src/main/resources/assets/szar/blockstates/ender_obsidian.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "szar:block/ender_obsidian" + } + } +} diff --git a/src/main/resources/assets/szar/blockstates/ender_ore.json b/src/main/resources/assets/szar/blockstates/ender_ore.json new file mode 100644 index 0000000..d002e89 --- /dev/null +++ b/src/main/resources/assets/szar/blockstates/ender_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "szar:block/ender_ore" + } + } +} diff --git a/src/main/resources/assets/szar/lang/en_us.json b/src/main/resources/assets/szar/lang/en_us.json index 0152570..8a8800e 100644 --- a/src/main/resources/assets/szar/lang/en_us.json +++ b/src/main/resources/assets/szar/lang/en_us.json @@ -202,5 +202,9 @@ "block.szar.chorus_endstone": "Chorus EndStone", "block.szar.small_chorus": "Small Chorus", - "block.szar.small_chorus_flower": "Small Chorus Flower" + "block.szar.small_chorus_flower": "Small Chorus Flower", + "block.szar.ender_obsidian": "Ender Obsidian", + "block.szar.ender_ore": "Ender Ore", + "item.szar.raw_ender": "Raw Ender", + "item.szar.ender_ingot": "Ender Ingot" } diff --git a/src/main/resources/assets/szar/models/block/ender_obsidian.json b/src/main/resources/assets/szar/models/block/ender_obsidian.json new file mode 100644 index 0000000..000822d --- /dev/null +++ b/src/main/resources/assets/szar/models/block/ender_obsidian.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "szar:block/ender_obsidian" + } +} diff --git a/src/main/resources/assets/szar/models/block/ender_ore.json b/src/main/resources/assets/szar/models/block/ender_ore.json new file mode 100644 index 0000000..ffb97b3 --- /dev/null +++ b/src/main/resources/assets/szar/models/block/ender_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "szar:block/ender_ore" + } +} diff --git a/src/main/resources/assets/szar/models/item/ender_ingot.json b/src/main/resources/assets/szar/models/item/ender_ingot.json new file mode 100644 index 0000000..a4df44a --- /dev/null +++ b/src/main/resources/assets/szar/models/item/ender_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "szar:item/ender_ingot" + } +} diff --git a/src/main/resources/assets/szar/models/item/ender_obsidian.json b/src/main/resources/assets/szar/models/item/ender_obsidian.json new file mode 100644 index 0000000..113cc40 --- /dev/null +++ b/src/main/resources/assets/szar/models/item/ender_obsidian.json @@ -0,0 +1,3 @@ +{ + "parent": "szar:block/ender_obsidian" +} diff --git a/src/main/resources/assets/szar/models/item/ender_ore.json b/src/main/resources/assets/szar/models/item/ender_ore.json new file mode 100644 index 0000000..4204e9f --- /dev/null +++ b/src/main/resources/assets/szar/models/item/ender_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "szar:block/ender_ore" +} diff --git a/src/main/resources/assets/szar/models/item/raw_ender.json b/src/main/resources/assets/szar/models/item/raw_ender.json new file mode 100644 index 0000000..44d8e21 --- /dev/null +++ b/src/main/resources/assets/szar/models/item/raw_ender.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "szar:item/raw_ender" + } +} diff --git a/src/main/resources/assets/szar/textures/block/crying_obsidian.png b/src/main/resources/assets/szar/textures/block/crying_obsidian.png new file mode 100644 index 0000000000000000000000000000000000000000..df10b446bb8d7cc5d4148b633d319ef1ccbe37a5 GIT binary patch literal 315 zcmV-B0mS}^P)0ubMOPy(V03ZM-BltWwe5ws@b?A^mk;&|iDdSl)lTEtXwonB43 z)A8K6yDg8lT<&>RXiqLE0>mQj1mht0|y`t4$8Di=AUfJpVu4DMkmMO0nB2j~)oc9;V*x{|!^!*|?qEWKb`+dVyQn zO{F`3l>21nc3l~yGb8vjQ^6DA2N%jsL%wF;^(ZIO5pmp9PPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0oqAKK~y+TU6Ri$ zgkccJXLq%-ezXqjfLbN*iIAv0Xm5%WH`&^QqNMiZ;Gj^hE+Plz<_~ajcOoUki4=tc z2eMivTF+Ht`=W1KT(cn`t`2r&gKgW zSdtY%E!m27tt|w}=8F&{PLla?jFfKf3%6;6l@dFo4CzNl?K+>(dvyp(!U)fkYB z4pp_XJA-B@*zVK)fGKarP#MHCeUcd*l#AU1>75=^w5OIPwY8(eYOe;yeZ-2SSLft@ zdD~I1pn^bU?Yn|(s%-uZ(ijMjB;(XX7Zme4R0+cGvvd=8)<94#VgbseGTktv04bDg zY&ief0vkZQ&6Qx<2=iekH%sdh^U~7z^sRm*nk~$@IkZX2>(tfQ%2JDyYPlb6?dh4g z*lqQlfk&Vlo;*{(9-7j7WTxhPW>?a1$X8jV8ec5!)xU&swl3K4T%;IdWAl%fDAj@g*Kb>zqQCO)A%oZ Tmusk300000NkvXXu0mjfpe+g` literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/szar/textures/block/ender_ore.png b/src/main/resources/assets/szar/textures/block/ender_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..12c8722c44194311a38c90bb154b1a8ba1876969 GIT binary patch literal 489 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0e(qDK~y+TWmCIK z15ps2HIOC>X>3$b5Vg=I#e%^i-{233jfx0XR$?QFRer$6PY`VU39+!SQEVhO1~kZ` zAjmpr=APYq&BEc{d7Lwk-IZpeRf=R4dWX9ueC^3OJK<|@ZI;b$$83Y%>5Bv;z(oL( zA;vh#b%8+c7cb@7-E~OJs!CSnU)+73BVI`?2xTTLogKwhk~m`QP;FHTRR9VSAl99! zI66~6#Kchrh?7W)E8=b=1%avq1WD!{^OA(qDu=mg114f^1P293=H25pIbHa;V+^R| zWPfAG<#>wJ!F_;$wqb`vL)@{A5GQ~Ha=NH`sT_gbpuohac!dadAv15EGUy%1{OP{t ziQHe_*okL*rDLadDo-bU{eE_&o9B|D((mH5Os#9e)vb(*fhVdc9@wiF=kharm*L~H z%x>iJuy<_nukQ~Ld$-Z7@j~IFKZUm+_K_Gy=0f2EFtZE!kLGV9{0j&;IsHiBZ!9m^ f2@=JC+HRG9Kdp6FD}oh_00000NkvXXu0mjfa@Er| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/szar/textures/item/ender_ingot.png b/src/main/resources/assets/szar/textures/item/ender_ingot.png new file mode 100644 index 0000000000000000000000000000000000000000..0ae630dad58892b961c3cd16bac12ad495926190 GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4J@86jv*HQ$r4r$7w&(x=WyOxaDZd!My3>A zpm7aioTEdU>OpgrS+MfJy_@>NqMFU@j0Qs2= z%S>zU95A^7^hf5u#6_IuERmPHmY$Z#i{EkN!}F8eD>#@A@G>w?@K)MnbRZ{YRz!-5 zL(dNm zP3iPtH*j`%aPxP0g4A@ilm;aZZ~p!9d)Ph~W=i=qG%_+=dQecMzp1Jp7)T7Bu6{1- HoD!M<3L}S( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/szar/textures/item/raw_ender.png b/src/main/resources/assets/szar/textures/item/raw_ender.png new file mode 100644 index 0000000000000000000000000000000000000000..76643670660ecc2b3274682de4e6b93941d0a436 GIT binary patch literal 441 zcmV;q0Y?6bP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0ZvIoK~y+TW1ti; zLTMDhV{Y&t%4GO*@&Z;hFn}Tn(-<k(Xa@V(aE6O- zUNF2rbP_Di%)!C%@9hVM{R@_2HG~ODg8@wQ+Z_iP{(bua#=qZvVEE6?!SMb42dFAk z05%b1JIL98B}E{bzyAPB!T=K|2Lr2+0K=A=R))W~9-z1a>;jPKYYM6u)`zEo1xW#5 z12_c*7y?($VsOY#W;ir|DOiG7zzA|aNb~FUJHY}V=kDyA%HW!r4Cb>43or=UnKLYN z3&U_e2rz-14-0W*05S-KL7HKPgDitZH4MN5(JnC>ECBL?b8$A94FaHm0|A&fL6#ku zIu{_8ODW$4S#tKE1X?_{e8MT28I)&3b&Ro zl{&-D7;vDGVbfcMhN}z`4U#NOFQnMH6A~C05?`m>?&CB24-5wePgg&ebxsLQ0GjQD AFaQ7m literal 0 HcmV?d00001 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 7e61b98..c307a42 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -3,6 +3,8 @@ "values": [ "szar:uranium_ore", "szar:niggerite_block", - "szar:chorus_endstone" + "szar:chorus_endstone", + "szar:ender_ore", + "szar:ender_obsidian" ] } diff --git a/src/main/resources/data/szar/loot_tables/blocks/ender_ore.json b/src/main/resources/data/szar/loot_tables/blocks/ender_ore.json new file mode 100644 index 0000000..b6dd8dc --- /dev/null +++ b/src/main/resources/data/szar/loot_tables/blocks/ender_ore.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "szar:ender_ore", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ], + "items": [ + "minecraft:diamond_pickaxe", + "minecraft:netherite_pickaxe" + ] + } + } + ] + }, + { + "type": "minecraft:item", + "name": "szar:raw_ender", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:netherite_pickaxe" + ] + } + } + ] + } + ] + } + ] + } + ] +} diff --git a/src/main/resources/data/szar/recipes/ender_ingot.json b/src/main/resources/data/szar/recipes/ender_ingot.json new file mode 100644 index 0000000..6564525 --- /dev/null +++ b/src/main/resources/data/szar/recipes/ender_ingot.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "szar:raw_ender" + }, + "result": "szar:ender_ingot", + "experience": 5.0, + "cookingtime": 400 +} \ No newline at end of file