From bcc90e5593f2e27b96e2afd695218868f4a2b5b8 Mon Sep 17 00:00:00 2001 From: TGGamesYT Date: Mon, 13 Apr 2026 16:38:52 +0200 Subject: [PATCH] super diamond and apple --- gradle.properties | 2 +- .../szar/client/MagyarEntityRenderer.java | 12 ++--- .../dev/tggamesyt/szar/client/SzarClient.java | 4 ++ .../minecraft/tags/items/music_discs.json | 3 +- .../java/dev/tggamesyt/szar/MagyarEntity.java | 19 ++------ src/main/java/dev/tggamesyt/szar/Szar.java | 46 ++++++++++++++++++ .../resources/assets/szar/lang/en_us.json | 5 +- .../assets/szar/models/item/super_apple.json | 2 +- .../szar/models/item/super_diamond.json | 2 +- .../assets/szar/textures/entity/orban.png | Bin 895 -> 1244 bytes .../szar/textures/item/ender_diamond.png | Bin 0 -> 848 bytes .../szar/textures/item/netherite_diamond.png | Bin 0 -> 268 bytes .../szar/textures/item/smol_diamond.png | Bin 0 -> 628 bytes .../szar/textures/item/super_diamond.png | Bin 0 -> 970 bytes .../resources/data/szar/recipes/ak47.json | 8 --- .../data/szar/recipes/super_apple.json | 25 +++------- .../data/szar/recipes/super_diamond.json | 32 +++++------- 17 files changed, 88 insertions(+), 72 deletions(-) create mode 100644 src/main/resources/assets/szar/textures/item/ender_diamond.png create mode 100644 src/main/resources/assets/szar/textures/item/netherite_diamond.png create mode 100644 src/main/resources/assets/szar/textures/item/smol_diamond.png create mode 100644 src/main/resources/assets/szar/textures/item/super_diamond.png diff --git a/gradle.properties b/gradle.properties index 164737e..a0c413a 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.4.13.1 +mod_version=26.4.13.2 maven_group=dev.tggamesyt archives_base_name=szar # Dependencies diff --git a/src/client/java/dev/tggamesyt/szar/client/MagyarEntityRenderer.java b/src/client/java/dev/tggamesyt/szar/client/MagyarEntityRenderer.java index 916957b..a1ca8c9 100644 --- a/src/client/java/dev/tggamesyt/szar/client/MagyarEntityRenderer.java +++ b/src/client/java/dev/tggamesyt/szar/client/MagyarEntityRenderer.java @@ -1,16 +1,16 @@ package dev.tggamesyt.szar.client; -import dev.tggamesyt.szar.OrbanEntity; +import dev.tggamesyt.szar.MagyarEntity; import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.render.entity.MobEntityRenderer; import net.minecraft.client.render.entity.model.BipedEntityModel; import net.minecraft.client.render.entity.model.EntityModelLayers; import net.minecraft.util.Identifier; -public class OrbanEntityRenderer - extends MobEntityRenderer> { +public class MagyarEntityRenderer + extends MobEntityRenderer> { - public OrbanEntityRenderer(EntityRendererFactory.Context context) { + public MagyarEntityRenderer(EntityRendererFactory.Context context) { super( context, new BipedEntityModel<>(context.getPart(EntityModelLayers.PLAYER)), @@ -19,8 +19,8 @@ public class OrbanEntityRenderer } @Override - public Identifier getTexture(OrbanEntity entity) { - return new Identifier("szar", "textures/entity/orban.png"); + public Identifier getTexture(MagyarEntity entity) { + return new Identifier("szar", "textures/entity/magyar.png"); } } diff --git a/src/client/java/dev/tggamesyt/szar/client/SzarClient.java b/src/client/java/dev/tggamesyt/szar/client/SzarClient.java index 0b82cc2..f3915a9 100644 --- a/src/client/java/dev/tggamesyt/szar/client/SzarClient.java +++ b/src/client/java/dev/tggamesyt/szar/client/SzarClient.java @@ -552,6 +552,10 @@ public class SzarClient implements ClientModInitializer { OrbanEntityType, OrbanEntityRenderer::new ); + EntityRendererRegistry.register( + MagyarEntityType, + MagyarEntityRenderer::new + ); EntityRendererRegistry.register( Szar.StalinEntityType, StalinEntityRenderer::new diff --git a/src/main/generated/data/minecraft/tags/items/music_discs.json b/src/main/generated/data/minecraft/tags/items/music_discs.json index 2243dc5..031d0ec 100644 --- a/src/main/generated/data/minecraft/tags/items/music_discs.json +++ b/src/main/generated/data/minecraft/tags/items/music_discs.json @@ -6,6 +6,7 @@ "szar:efn", "szar:hello", "szar:erika", - "szar:ussr" + "szar:ussr", + "szar:hun_disc" ] } \ No newline at end of file diff --git a/src/main/java/dev/tggamesyt/szar/MagyarEntity.java b/src/main/java/dev/tggamesyt/szar/MagyarEntity.java index a2a9b10..b3c8baf 100644 --- a/src/main/java/dev/tggamesyt/szar/MagyarEntity.java +++ b/src/main/java/dev/tggamesyt/szar/MagyarEntity.java @@ -1,8 +1,6 @@ package dev.tggamesyt.szar; -import net.minecraft.entity.EntityData; import net.minecraft.entity.EntityType; -import net.minecraft.entity.SpawnReason; import net.minecraft.entity.ai.goal.MeleeAttackGoal; import net.minecraft.entity.ai.goal.WanderAroundFarGoal; import net.minecraft.entity.attribute.DefaultAttributeContainer; @@ -10,22 +8,13 @@ import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.mob.MobEntity; import net.minecraft.entity.mob.PathAwareEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.nbt.NbtCompound; -import net.minecraft.nbt.NbtList; -import net.minecraft.nbt.NbtString; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.world.LocalDifficulty; -import net.minecraft.world.ServerWorldAccess; import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; -public class OrbanEntity extends PathAwareEntity implements Arrestable, HunPartie { +public class MagyarEntity extends PathAwareEntity implements Arrestable, HunPartie { public static boolean arrestable = false; - public OrbanEntity(EntityType type, World world) { + public MagyarEntity(EntityType type, World world) { super(type, world); } @@ -36,7 +25,7 @@ public class OrbanEntity extends PathAwareEntity implements Arrestable, HunParti this.goalSelector.add(1, new MeleeAttackGoal(this, 1.0, true)); this.targetSelector.add(1, new AggroOnHitRevengeGoal(this)); - this.targetSelector.add(2, new AttackEnemyHunGoal(this, "fidesz")); + this.targetSelector.add(2, new AttackEnemyHunGoal(this, "tisza")); } @@ -62,6 +51,6 @@ public class OrbanEntity extends PathAwareEntity implements Arrestable, HunParti @Override public String getTeam() { - return "fidesz"; + return "tisza"; } } diff --git a/src/main/java/dev/tggamesyt/szar/Szar.java b/src/main/java/dev/tggamesyt/szar/Szar.java index 5cd0b8f..913d8c4 100644 --- a/src/main/java/dev/tggamesyt/szar/Szar.java +++ b/src/main/java/dev/tggamesyt/szar/Szar.java @@ -43,6 +43,7 @@ import net.minecraft.entity.data.TrackedDataHandlerRegistry; import net.minecraft.entity.decoration.painting.PaintingVariant; import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.passive.VillagerEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.*; @@ -295,6 +296,15 @@ public class Szar implements ModInitializer { .dimensions(EntityDimensions.fixed(0.6F, 1.8F)) .build() ); + public static final EntityType MagyarEntityType = + Registry.register( + Registries.ENTITY_TYPE, + new Identifier(MOD_ID, "magyar"), + FabricEntityTypeBuilder + .create(SpawnGroup.CREATURE, MagyarEntity::new) + .dimensions(EntityDimensions.fixed(0.6F, 1.8F)) + .build() + ); public static final EntityType StalinEntityType = Registry.register( Registries.ENTITY_TYPE, @@ -405,6 +415,8 @@ public class Szar implements ModInitializer { entries.add(Szar.ENDER_ORE_ITEM); entries.add(Szar.RAW_ENDER); entries.add(Szar.ENDER_INGOT); + entries.add(Szar.SUPER_DIAMOND); + entries.add(Szar.SUPER_APPLE); // blueprint stuff entries.add(BlueprintBlocks.BLUEPRINT); entries.add(BlueprintBlocks.BLUEPRINT_DOOR_ITEM); @@ -454,6 +466,7 @@ public class Szar implements ModInitializer { entries.add(Szar.USSR_DISC); // politics entries.add(Szar.ORBAN_SPAWNEGG); + entries.add(Szar.MAGYAR_SPAWNEGG); entries.add(Szar.HUN_DISC); // racism if (showRacist) { @@ -853,6 +866,10 @@ public class Szar implements ModInitializer { OrbanEntityType, OrbanEntity.createAttributes() ); + FabricDefaultAttributeRegistry.register( + MagyarEntityType, + MagyarEntity.createAttributes() + ); FabricDefaultAttributeRegistry.register( CommunistEntityType, CommunistEntity.createAttributes() @@ -1572,6 +1589,25 @@ public class Szar implements ModInitializer { new Identifier(MOD_ID, "ender_ingot"), new Item(new FabricItemSettings()) ); + public static final Item SUPER_DIAMOND = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "super_diamond"), + new Item(new FabricItemSettings()) + ); + public static final Item SUPER_APPLE = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "super_apple"), + new Item(new FabricItemSettings().food( + new FoodComponent.Builder() + .hunger(20) + .alwaysEdible() + .saturationModifier(20F) + .statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION,10, 255 ), 1F) + .statusEffect(new StatusEffectInstance(StatusEffects.HEALTH_BOOST,120, 4 ), 1F) + .statusEffect(new StatusEffectInstance(StatusEffects.RESISTANCE,120, 8), 1F) + .build() + )) + ); // Blocks public static final TrackerBlock TRACKER_BLOCK = Registry.register( Registries.BLOCK, new Identifier(MOD_ID, "tracker"), @@ -2357,6 +2393,16 @@ public class Szar implements ModInitializer { new Item.Settings() ) ); + public static final Item MAGYAR_SPAWNEGG = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "magyar_spawn_egg"), + new SpawnEggItem( + MagyarEntityType, + 0x24B573, + 0xED4551, + new Item.Settings() + ) + ); public static final Item HITTER_SPAWNEGG = Registry.register( Registries.ITEM, new Identifier(MOD_ID, "hitler_spawn_egg"), diff --git a/src/main/resources/assets/szar/lang/en_us.json b/src/main/resources/assets/szar/lang/en_us.json index c73c12f..ee91088 100644 --- a/src/main/resources/assets/szar/lang/en_us.json +++ b/src/main/resources/assets/szar/lang/en_us.json @@ -207,6 +207,8 @@ "block.szar.ender_ore": "Ender Ore", "item.szar.raw_ender": "Raw Ender", "item.szar.ender_ingot": "Ender Ingot", + "item.szar.super_diamond": "Super Diamond", + "item.szar.super_apple": "Super Apple", "advancement.szar.april_game_beaten.title": "We are so back", "advancement.szar.april_game_beaten.description": "Beat the game on april 1st to flip the game back.", @@ -215,5 +217,6 @@ "entity.szar.magyar": "Magyar Péter", "item.szar.hun_disc": "Music Disc", "item.szar.hun_disc.desc": "Kölcsey Ferenc - Hungarian Anthem", - "item.szar.orban_spawn_egg": "Orbán Spawn Egg" + "item.szar.orban_spawn_egg": "Orbán Spawn Egg", + "item.szar.magyar_spawn_egg": "Magyar Spawn Egg" } diff --git a/src/main/resources/assets/szar/models/item/super_apple.json b/src/main/resources/assets/szar/models/item/super_apple.json index f8ca665..0b0a902 100644 --- a/src/main/resources/assets/szar/models/item/super_apple.json +++ b/src/main/resources/assets/szar/models/item/super_apple.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "szar:item/bullet" + "layer0": "szar:item/super_apple" } } diff --git a/src/main/resources/assets/szar/models/item/super_diamond.json b/src/main/resources/assets/szar/models/item/super_diamond.json index f8ca665..5637e5a 100644 --- a/src/main/resources/assets/szar/models/item/super_diamond.json +++ b/src/main/resources/assets/szar/models/item/super_diamond.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "szar:item/bullet" + "layer0": "szar:item/super_diamond" } } diff --git a/src/main/resources/assets/szar/textures/entity/orban.png b/src/main/resources/assets/szar/textures/entity/orban.png index fde93a95d8f04fcf5a3a148631d5763b8ccafca3..9d1851f9ce116d11eb0111737a642add4ab241f3 100644 GIT binary patch literal 1244 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4egmB5hW46K32*3xq68y`AMmI6}bgK)eHls47YguJQ{>uF6ifOi{PD zbs{}UK3djZt>nqvW6s4qD1-ZCERRDRmN*N_31y=g{ z<>lpi<;HsXMd|v6mX?v90`zGE;%B09k2gXakl<5wp<;IRwdJb`TMuUx6%m z$bf@hlL@>{-psv0G8w6h z_&Sfgyt!)esckOr|2la5DiPY_@4viUJ@dukfB*J*o6bCSS3ZPm!CL#vE2gO#g#_@L zHE^vu$QIyedV@i0MccL4w)!m$3@>)cU3mWdIU~ceOtvo;IeB?%QR*#e4dOL>-RLQb!B(r;85JK^+m$ZPZ|kK zuIJ)C|8Fk|27#X@+HFMVcB~+Il%6~6Ax%q0TZGuKn(elG59Jmf} zUs(NqZ|TOEqnG!Z|MRrYzrQeIos#)H-Yrv)vu@&SOZ=f$adU!Lu+wh_{TX*E#M0ZX zSJ>6Hq`ek7drdRWzP@R`e0=HFuM6fb?~$pHlHFxF@w$G+w=pI!rIap z7-HUL?YPxDWumgX_EfKp^KQO>YaPOrXLNwu?(?Oi6%QG6jf8%E)pS0~Ai4Zg3LqOg{@U=q{@--_()-`__EXL?pd=MG zu!>MuMu$7+Ujx%hNSDiv@BeQLy-wjd)WEO5LZoxY;m7uyjTssbZb`iXDq=ic{an^L HB{Ts5b|LV5 delta 873 zcmV-v1D5>U3I7I=BYy)%Nkl}!nH6`o5*-qHq%6>}q``&vqnW;turQL3uL0#4^{R)(z-F>Wy#z?YVIDa_=02zQTfH44rU;qM` z1+tz7d1004}> z&WOJG?F@lBC|g{4M%M3NBpXj2Qf1elza$&m-^u=Vi=3K2NmyTKgLfW~PRlb;;F($g zm|6D^4$0x@h*oz8w&kxbo+a=d3IO0N000y}7BC>#Gk@_Q$Qa<4&p}a8^7Xr~E=5=G zUAEcba1GXhfxzm1K@i##2Y_XPpaqT7=b2JG#d%Ed1_-Y!Bo2Ugg1KDIwe~L*3a&1O zVFaeFxzo1-_YU6iy!E5sA0x>hZLPXQME(6?YA^&KCI*a*4=&5(_1hxj)As*{0RX_# zqaCW$&VP#~l3D=D<+7B|?hY?-E&HzkgrZ4=P9jEWvjTuD*el8W-1P|4m+zV$0FHGD z>k9I!+Y(X(z>PQO=!CwkP46AzQkEwtH2}=o@(c_FK(MfySr9}9gj@*49S_h2&;^1w zSDLQtQY*osc}3|;(7UII>LQv|cz<}$IGlz#zW`5yW6!yfv?A|ci`IqKYLfA4lT zst~{Jv1RpTKqk?jq@yaMqCWzl0@W3{Zh;mSiFWvSck4b43QIKs8G; zkpWq8Gr!9biaUE4jCYM1xC3Gs5)L3O`Nrh z4q`q;a-?Gb0-)%IiO6!ufMW#E1q5e*A|_!B5FsRL#~_G7P|ZC<5%Vw$q$LZ;-Y*yo z24RiO?dNy?A6BSz7LW$u?bEPxls47YguJQ{>uF6ifOi{PD zbs{}UK3djZt>nqvW6s4qD1-ZCERRDRmN*N_31y=g{ z<>lpi<;HsXMd|v6mX?v90`zGE;%B09k2gXakl<5wp<;IRwdJb`TMuUx6%m z$bfg~)f%OfK3O5(mqzG>;HBeoYyC6f$N~>!b(}IdS z*EakVdiv_6%cRfUJPg_Uav8FwNB(&zu-0wz$IsgHuZpvuwtBIVDahzRhS4;oXE#_b zb*iNIe_!?_aW}KW>Wfp9_D4>&pISHlPU$q>1z}pJ^~#jl8LnviFMDh#+wRTZ_4l&y ztEEQ5_m{mnbo1W&o<}BOmdKI;Vst078j9g8%>k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/szar/textures/item/netherite_diamond.png b/src/main/resources/assets/szar/textures/item/netherite_diamond.png new file mode 100644 index 0000000000000000000000000000000000000000..928f6fba8fd64744322a7ea604de7d38f54e88bc GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!G)eKjv*HQXD3>7H5drE>~*SId)3eSB6mat z_dTaQ_8R^Ykxq7EVthP`C(oVM)9kvxN^kY$Tl@XH4s4X~-(FhHA6OxC?DpwBcN*4Z z`ah46N;=FUn)XzOdn3cvb)mAZjCD8q8g?#czNT=5>C2)+6|a7mGx#jz-ORo~znAIF z8m(!K93m_VdLm&C*CI`NiWrW0G6}G5dHLVzTd6je^S9S_7g>2W9`fPg*VhC(mci52 K&t;ucLK6Ui23<1% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/szar/textures/item/smol_diamond.png b/src/main/resources/assets/szar/textures/item/smol_diamond.png new file mode 100644 index 0000000000000000000000000000000000000000..fb1d636b19e2a6d602c1c6275c4fde972fd92d0b GIT binary patch literal 628 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4egmB5hW46K32*3xq68y`AMmI6}bgK)eHls47YguJQ{>uF6ifOi{PD zbs{}UK3djZt>nqvW6s4qD1-ZCERRDRmN*N_31y=g{ z<>lpi<;HsXMd|v6mX?v90`zGE;%B09k2gXakl<5wp<;IRwdJb`TMuUx6%m z$bfls47YguJQ{>uF6ifOi{PD zbs{}UK3djZt>nqvW6s4qD1-ZCERRDRmN*N_31y=g{ z<>lpi<;HsXMd|v6mX?v90`zGE;%B09k2gXakl<5wp<;IRwdJb`TMuUx6%m z$bfsxJbL1O;3=DsPo`;U?R3p{_2DCi~eMTv0EUD7;lDc^RYR?Cf}UY2Wv~vmeZ~yZ3(1=Y8yafAUKz*nMa0QjG6cV|-Ened5zk)AtwE8k9O0 zg%<@)*(I`6FIoK9kt@6(KQUPCWezrfa%Sge5iZts`>M{pUi+S*#e{e1l=CUm9arzr zzjge@1|HGY{b8^}WLMm6*UpO<@ zZr-#-S6qAjJ6`X4v}@gpkDP&vmp?5qQeBqk@mjR;S#tG@8((h+`_GVn@$BDX$$fWs zp4<}s@b5RV?%Aa&rL4J6RI>l>-QmZap8J>Wt|C3JuTamnD@JD#+_}XKlT;@ic>jrmCi~ ztEQOZh0WW)cFRkfK02NH=G3oz!?#KsF5A?ubaCdsbfM{m_tN;yN9y#i#-}cwBIBbn z;hlh=nRAAL+xzC}Q`U;!FS{kVA(`odg#dfPd3EUn>i^V#aGv