super diamond and apple

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

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<OrbanEntity, BipedEntityModel<OrbanEntity>> {
+public class MagyarEntityRenderer
+        extends MobEntityRenderer<MagyarEntity, BipedEntityModel<MagyarEntity>> {
 
-    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");
     }
 }
 

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

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"
   ]
 }

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<? extends PathAwareEntity> type, World world) {
+    public MagyarEntity(EntityType<? extends PathAwareEntity> 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";
     }
 }

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<MagyarEntity> 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<StalinEntity> 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"),

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"
 }

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"
   }
 }

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"
   }
 }

src/main/resources/data/szar/recipes/ak47.json

@@ -1,13 +1,5 @@
 {
   "type": "minecraft:crafting_shaped",
-  "ingredients": [
-    {
-      "item": "minecraft:gunpowder"
-    },
-    {
-      "item": "minecraft:iron_nugget"
-    }
-  ],
   "pattern": [
     "PPP",
     "BBB",

src/main/resources/data/szar/recipes/super_apple.json

@@ -1,23 +1,14 @@
 {
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "NEN",
-    "EDN",
-    "NEN"
-  ],
-  "key": {
-    "N": {
-      "item": "minecraft:netherite_ingot"
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "minecraft:apple"
     },
-    "D": {
-      "item": "minecraft:diamond"
-    },
-    "E": {
-      "item": "szar:ender_ingot"
+    {
+      "item": "szar:super_diamond"
     }
-  },
+  ],
   "result": {
-    "item": "szar:super_diamond",
-    "count": 1
+    "item": "szar:super_apple"
   }
 }

src/main/resources/data/szar/recipes/super_diamond.json

@@ -1,33 +1,23 @@
 {
   "type": "minecraft:crafting_shaped",
-  "ingredients": [
-    {
-      "item": "minecraft:gunpowder"
-    },
-    {
-      "item": "minecraft:iron_nugget"
-    }
-  ],
   "pattern": [
-    "PPP",
-    "BBB",
-    "LRB"
+    "NEN",
+    "EDN",
+    "NEN"
   ],
   "key": {
-    "P": {
-      "tag": "minecraft:planks"
+    "N": {
+      "item": "minecraft:netherite_ingot"
     },
-    "B": {
-      "item": "minecraft:iron_block"
+    "D": {
+      "item": "minecraft:diamond"
     },
-    "L": {
-      "item": "minecraft:leather"
-    },
-    "R": {
-      "item": "minecraft:redstone"
+    "E": {
+      "item": "szar:ender_ingot"
     }
   },
   "result": {
-    "item": "szar:ak47"
+    "item": "szar:super_diamond",
+    "count": 1
   }
 }