D12's 1.20.1(rider upgrade)

src/generated/resources/.cache/04be5e97bf4d7144441a568533bcef2d5d88cc7d

@@ -103,6 +103,7 @@ c551f7f40b62278b6423b57b00126deec9035225 assets/modulargolems/models/item/quartz
 43717a5eb1b01a2e9640f297929c1b5d838cbd26 assets/modulargolems/models/item/recycle_blue.json
 e21189fc27b4253bd81cbafcc4bfeee9bd19683c assets/modulargolems/models/item/recycle_purple.json
 295b30187a6f2f55f4089bec3ff128db02269865 assets/modulargolems/models/item/retrieval_wand.json
+2b92cf818596b85466df98f955ce653f3eeddb55 assets/modulargolems/models/item/rider_wand.json
 9806afe1161ebd9726ce1a694c0c8cbd8f081122 assets/modulargolems/models/item/slow.json
 9c32e472d6fddd1120cd945cfcd0f36e5adaa630 assets/modulargolems/models/item/slow_blue.json
 95f8a06aead32162ab7be1fdd8aece601f509835 assets/modulargolems/models/item/slow_purple.json

src/generated/resources/.cache/7680bc12dd1f97f7626d19ff0abb81845e7fa9a8

@@ -1,3 +1,4 @@
 // 1.20.1	2023-07-06T09:24:53.44889	Golem Config
+
 c2109e3144fe2e624e8895b77ea4815b55d19cd3 data/modulargolems/modulargolems_config/materials/vanilla.json
 45c774627b2c77dbae4c65f4654dd7033fda2f83 data/modulargolems/modulargolems_config/parts/default.json

src/generated/resources/assets/modulargolems/lang/en_ud.json

@@ -127,6 +127,7 @@
   "item.modulargolems.quartz": "ǝpɐɹbd∩ zʇɹɐnὉ",
   "item.modulargolems.recycle": "ǝpɐɹbdb∩ ǝןɔʎɔǝᴚ",
   "item.modulargolems.retrieval_wand": "puɐM ןɐʌǝıɹʇǝᴚ",
+  "item.modulargolems.rider_wand": "puɐM ɹǝpıᴚ",
   "item.modulargolems.slow": "ssǝuʍoןS :ǝpɐɹbd∩ uoıʇoԀ",
   "item.modulargolems.soul_flame": "ǝɯɐןℲ ןnoS :ǝpɐɹbd∩ uoıʇoԀ",
   "item.modulargolems.speed": "ǝpɐɹbd∩ pǝǝdS",
@@ -232,6 +233,7 @@
   "modulargolems.tooltip.standing": ")%s '%s '%s( ʇɐ ʎɐʇs ןןıʍ ɯǝןo⅁",
   "modulargolems.wand.command": "˙ʇı oʇ ʇǝbɹɐʇ ɥɔʇıʍs oʇ sɯǝןob buıpunoɹɹns ɹnoʎ ןןɐ ןןɐɔ ןןıʍ puɐʍ sıɥʇ ɥʇıʍ ʎʇıʇuǝ buıʞɔɐʇʇⱯ ˙ʎɹoʇuǝʌuı ǝɹnbıɟuoɔ oʇ ɯǝןob pıouɐɯnH ʞɔıןɔ ʇɥbıɹ ʇɟıɥS ˙sɯǝןob ɹoɟ sǝpoɯ ɥɔʇıʍs oʇ ʞɔıןɔ ʇɥbıᴚ",
   "modulargolems.wand.retrieve": "˙ʎɹoʇuǝʌuı oʇuı ʞɔɐq ɯǝןob ǝʌǝıɹʇǝɹ oʇ sɯǝןob ʎɐʍɐɹɐɟ ʞɔıןɔ ʇɥbıɹ ʇɟıɥS ˙sɯǝןob buıpunoɹɹns ɹnoʎ ןןɐ ǝʌǝıɹʇǝɹ oʇ ʞɔıןɔ ʇɥbıᴚ",
+  "modulargolems.wand.rider": "˙ʇı uo ǝpıɹ oʇ ɯǝןobbop ɹnoʎ oʇ ʞɔıןɔ ʇɥbıᴚ",
   "modulargolems.wand.summon": "˙ʎɹoʇuǝʌuı ɹnoʎ ɯoɹɟ sɯǝןob ןןɐ uoɯɯns oʇ ʞɔıןɔ ʇɥbıɹ ʇɟıɥS ˙puɐʍ ǝɥʇ ʎq pǝʇuıod uoıʇısod ʎɐʍɐɹɐɟ ɐ oʇ ɯǝןob ǝuo uoɯɯns oʇ ʞɔıןɔ ʇɥbıᴚ",
   "patchouli.modulargolems.landing": "poɯ ǝpɐɹbdn puɐ ʎןqɯǝssɐ ɯǝןob ǝʞıן-ɹǝʞuı⟘ oʇ ǝɯoɔןǝM",
   "patchouli.modulargolems.title": "ǝpın⅁ ɯǝןo⅁ ɹɐןnpoW"

src/generated/resources/assets/modulargolems/lang/en_us.json

@@ -127,6 +127,7 @@
   "item.modulargolems.quartz": "Quartz Upgrade",
   "item.modulargolems.recycle": "Recycle Ugpgrade",
   "item.modulargolems.retrieval_wand": "Retrieval Wand",
+  "item.modulargolems.rider_wand": "Rider Wand",
   "item.modulargolems.slow": "Potion Upgrade: Slowness",
   "item.modulargolems.soul_flame": "Potion Upgrade: Soul Flame",
   "item.modulargolems.speed": "Speed Upgrade",
@@ -232,6 +233,7 @@
   "modulargolems.tooltip.standing": "Golem will stay at (%s, %s, %s)",
   "modulargolems.wand.command": "Right click to switch modes for golems. Shift right click Humanoid golem to configure inventory. Attacking entity with this wand will call all your surrounding golems to switch target to it.",
   "modulargolems.wand.retrieve": "Right click to retrieve all your surrounding golems. Shift right click faraway golems to retrieve golem back into inventory.",
+  "modulargolems.wand.rider": "Right click to your doggolem to ride on it.",
   "modulargolems.wand.summon": "Right click to summon one golem to a faraway position pointed by the wand. Shift right click to summon all golems from your inventory.",
   "patchouli.modulargolems.landing": "Welcome to Tinker-like golem assembly and upgrade mod",
   "patchouli.modulargolems.title": "Modular Golem Guide"

src/generated/resources/assets/modulargolems/models/item/rider_wand.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "modulargolems:item/rider_wand"
+  }
+}

src/main/java/dev/xkmc/modulargolems/content/entity/common/AbstractGolemEntity.java

@@ -66,7 +66,8 @@
 public class AbstractGolemEntity<T extends AbstractGolemEntity<T, P>, P extends IGolemPart<P>> extends AbstractGolem
 		implements IEntityAdditionalSpawnData, NeutralMob, OwnableEntity, PowerableMob {
 
-	protected AbstractGolemEntity(EntityType<T> type, Level level) {
+
+    protected AbstractGolemEntity(EntityType<T> type, Level level) {
 		super(type, level);
 		this.waterNavigation = new AmphibiousPathNavigation(this, level);
 		this.groundNavigation = new GroundPathNavigation(this, level);

src/main/java/dev/xkmc/modulargolems/content/entity/dog/DogGolemEntity.java

@@ -13,24 +13,29 @@
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
+import net.minecraft.util.Mth;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal;
 import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.Vec2;
 import net.minecraft.world.phys.Vec3;
-
 @SerialClass
 public class DogGolemEntity extends AbstractGolemEntity<DogGolemEntity, DogGolemPartType> {
-
+	private float standAnimO;
+	protected boolean isJumping;
 	public DogGolemEntity(EntityType<DogGolemEntity> type, Level level) {
 		super(type, level);
+		setMaxUpStep(1);
 	}
 
 	public float getTailAngle() {
@@ -41,7 +46,78 @@ public float getTailAngle() {
 			return (0.55F - percentage * 0.16F) * (float) Math.PI;
 		}
 	}
+	//ride
+	public void aiStep() {
+		super.aiStep();
+	}
+	protected void positionRider(Entity p_289569_, Entity.MoveFunction p_289558_) {
+		super.positionRider(p_289569_, p_289558_);
+		if (this.standAnimO > 0.0F) {
+			float f = Mth.sin(this.yBodyRot * ((float)Math.PI / 180F));
+			float f1 = Mth.cos(this.yBodyRot * ((float)Math.PI / 180F));
+			float f2 = 0.7F * this.standAnimO;
+			float f3 = 0.15F * this.standAnimO;
+			p_289558_.accept(p_289569_, this.getX() + (double)(f2 * f), this.getY() + this.getPassengersRidingOffset() + p_289569_.getMyRidingOffset() + (double)f3, this.getZ() - (double)(f2 * f1));
+			if (p_289569_ instanceof LivingEntity) {
+				((LivingEntity)p_289569_).yBodyRot = this.yBodyRot;
+			}
+		}
+	}
+	protected void tickRidden(Player player, Vec3 vec3) {
+		super.tickRidden(player, vec3);
+		Vec2 vec2 = this.getRiddenRotation(player);
+		this.setRot(vec2.y, vec2.x);
+		this.yRotO = this.yBodyRot = this.yHeadRot = this.getYRot();
+		if (this.isControlledByLocalInstance()) {
+			if (this.onGround()) {
+				if (player.jumping) {
+					this.executeRidersJump(vec3);
+				}
+			}
+		}
 
+	}
+	protected Vec2 getRiddenRotation(LivingEntity p_275502_) {
+		return new Vec2(p_275502_.getXRot() * 0.5F, p_275502_.getYRot());
+	}
+	protected Vec3 getRiddenInput(Player p_278278_, Vec3 p_275506_) {
+			float f = p_278278_.xxa * 0.5F;
+			float f1 = p_278278_.zza;
+			if (f1 <= 0.0F) {
+				f1 *= 0.25F;
+			}
+			return new Vec3((double)f, 0.0D, (double)f1);
+		}
+	public LivingEntity getControllingPassenger() {
+			Entity entity = this.getFirstPassenger();
+			if (entity instanceof LivingEntity) {
+				return (LivingEntity) entity;
+			}
+			return null;
+	}
+	protected float getRiddenSpeed(Player p_278336_) {
+		return (float)this.getAttributeValue(Attributes.MOVEMENT_SPEED);
+	}
+	//jump when ridding
+	public double getCustomJump() {
+		return 2;
+	}
+	public void setIsJumping(boolean p_30656_) {
+		this.isJumping = p_30656_;
+	}
+	protected void executeRidersJump(Vec3 p_275435_) {
+		Vec3 vec3 = this.getDeltaMovement();
+		this.setDeltaMovement(vec3.x, 0.53F, vec3.z);
+		this.setIsJumping(true);
+		this.hasImpulse = true;
+		net.minecraftforge.common.ForgeHooks.onLivingJump(this);
+		if (p_275435_.z > 0.0D) {
+			float f = Mth.sin(this.getYRot() * ((float)Math.PI / 180F));
+			float f1 = Mth.cos(this.getYRot() * ((float)Math.PI / 180F));
+			this.setDeltaMovement(this.getDeltaMovement().add((double)(-0.4F * f * 0.53F), 0.0D, (double)(0.4F * f1 *0.53F)));
+		}
+
+	}
 	// sit
 
 	protected static final EntityDataAccessor<Byte> DATA_FLAGS_ID = SynchedEntityData.defineId(DogGolemEntity.class, EntityDataSerializers.BYTE);

src/main/java/dev/xkmc/modulargolems/content/entity/dog/DogGolemRenderer.java

@@ -22,7 +22,7 @@ protected static void transform(PoseStack stack, ItemDisplayContext transform, @
 			case THIRD_PERSON_LEFT_HAND:
 			case THIRD_PERSON_RIGHT_HAND: {
 				stack.translate(0.25, 0.4, 0.5);
-				float size = 1F;
+				float size = 0.5F;
 				stack.scale(size, size, size);
 				break;
 			}
@@ -60,7 +60,7 @@ protected static void transform(PoseStack stack, ItemDisplayContext transform, @
 	}
 
 	public DogGolemRenderer(EntityRendererProvider.Context ctx) {
-		super(ctx, new DogGolemModel(ctx.bakeLayer(ModelLayers.WOLF)), 0.5F, DogGolemPartType::values);
+		super(ctx, new DogGolemModel(ctx.bakeLayer(ModelLayers.WOLF)), 1F, DogGolemPartType::values);
 	}
 
 	protected float getBob(DogGolemEntity dog, float pPartialTicks) {

src/main/java/dev/xkmc/modulargolems/content/entity/humanoid/HumanoidGolemEntity.java

@@ -90,7 +90,7 @@ public void reassessWeaponGoal() {
 	}
 
 	public ItemStack getProjectile(ItemStack pShootable) {
-		if (pShootable.getItem() instanceof ProjectileWeaponItem) {
+		if (pShootable.getItem() instanceof ProjectileWeaponItem ) {
 			Predicate<ItemStack> predicate = ((ProjectileWeaponItem) pShootable.getItem()).getSupportedHeldProjectiles();
 			ItemStack itemstack = ProjectileWeaponItem.getHeldProjectile(this, predicate);
 			return net.minecraftforge.common.ForgeHooks.getProjectile(this, pShootable, itemstack);
@@ -406,6 +406,45 @@ public void aiStep() {
 				stack.inventoryTick(level(), this, slot.ordinal(), slot == EquipmentSlot.MAINHAND);
 			}
 		}
+		attackStep();
+	}
+
+	public void attackStep() {
+			if (tickCount % 2 != 0) return;
+			LivingEntity target = getTarget();
+			ItemStack main = getItemBySlot(EquipmentSlot.MAINHAND);
+			ItemStack off = getItemBySlot(EquipmentSlot.OFFHAND);
+			if (main.getItem() instanceof ProjectileWeaponItem) {
+				if (getProjectile(main).isEmpty()) {
+					if (off.getItem() instanceof ProjectileWeaponItem) {
+						return;
+					}
+				} else {
+					if (target == null) {
+						return;
+					}
+					double d0 = distanceToSqr(target.getX(), target.getY(), target.getZ());
+					if (meleeGoal.getAttackReachSqr(target) < d0) {
+						return;
+					}
+				}
+			} else if (off.getItem() instanceof ProjectileWeaponItem) {
+				super.setItemInHand(InteractionHand.MAIN_HAND, off);
+				boolean noArrow = getProjectile(off).isEmpty();
+				super.setItemInHand(InteractionHand.MAIN_HAND, main);
+				if (noArrow) {
+					return;
+				}
+				if (target != null) {
+					double d0 = distanceToSqr(target.getX(), target.getY(), target.getZ());
+					if (meleeGoal.getAttackReachSqr(target) > d0) {
+						return;
+					}
+				}
+			} else {
+				return;
+			}
+			setItemInHand(InteractionHand.MAIN_HAND, off);
+			setItemInHand(InteractionHand.OFF_HAND, main);
+		}
 	}
-
-}

src/main/java/dev/xkmc/modulargolems/content/item/RiderWandItem.java

@@ -0,0 +1,45 @@
+package dev.xkmc.modulargolems.content.item;
+
+import dev.xkmc.modulargolems.content.entity.dog.DogGolemEntity;
+import net.minecraft.world.item.Item;
+import dev.xkmc.l2serial.util.Wrappers;
+import dev.xkmc.modulargolems.content.entity.common.AbstractGolemEntity;
+import dev.xkmc.modulargolems.init.data.MGLangData;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.TooltipFlag;
+import net.minecraft.world.level.Level;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+public class RiderWandItem extends Item implements WandItem {
+    public RiderWandItem(Properties props) {
+        super(props);
+    }
+
+    public InteractionResult interactLivingEntity(ItemStack stack, Player user, LivingEntity target, InteractionHand hand) {
+        if (!(target instanceof AbstractGolemEntity<?, ?> golem)) return InteractionResult.PASS;
+        return ride(target.level(), user, Wrappers.cast(golem)) ? InteractionResult.SUCCESS : InteractionResult.FAIL;
+    }
+    private static boolean ride(Level level, Player user, AbstractGolemEntity<?, ?> golem) {
+        if (!golem.isAlliedTo(user)) return false;
+        if (level.isClientSide()) return true;
+        if (golem instanceof DogGolemEntity e) {
+                user.startRiding(e,true);
+                return true;
+            }
+            return true;
+
+
+
+    }
+    public void appendHoverText(ItemStack pStack, @Nullable Level pLevel, List<Component> list, TooltipFlag pIsAdvanced) {
+        list.add(MGLangData.WAND_RIDER.get());
+    }
+
+}

src/main/java/dev/xkmc/modulargolems/events/GolemEventListeners.java

@@ -7,7 +7,7 @@
 import net.minecraft.world.entity.projectile.AbstractArrow;
 import net.minecraft.world.entity.projectile.ThrownTrident;
 import net.minecraft.world.item.ArrowItem;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.BowItem;
 import net.minecraft.world.item.TridentItem;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
@@ -18,9 +18,10 @@ public class GolemEventListeners {
 
 	@SubscribeEvent
 	public static void onEquip(GolemEquipEvent event) {
-		ItemStack stack = event.getStack();
-		if (stack.getItem() instanceof ArrowItem) {
-			event.setSlot(EquipmentSlot.OFFHAND, event.getStack().getCount());
+		if (!event.getEntity().getItemBySlot(EquipmentSlot.MAINHAND).isEmpty()) {
+			if (event.getStack().getItem() instanceof BowItem) {
+				event.setSlot(EquipmentSlot.OFFHAND, event.getStack().getCount());
+			}
 		}
 	}
 

src/main/java/dev/xkmc/modulargolems/init/data/MGLangData.java

@@ -28,6 +28,7 @@ public enum MGLangData {
 	WAND_RETRIEVE("wand.retrieve", "Right click to retrieve all your surrounding golems. Shift right click faraway golems to retrieve golem back into inventory.", 0, ChatFormatting.GRAY),
 	WAND_COMMAND("wand.command", "Right click to switch modes for golems. Shift right click Humanoid golem to configure inventory. Attacking entity with this wand will call all your surrounding golems to switch target to it.", 0, ChatFormatting.GRAY),
 	WAND_SUMMON("wand.summon", "Right click to summon one golem to a faraway position pointed by the wand. Shift right click to summon all golems from your inventory.", 0, ChatFormatting.GRAY),
+	WAND_RIDER("wand.rider","Right click to your doggolem to ride on it.",0, ChatFormatting.GRAY),
 
 	DESTROY_ITEM("msg.destroy_item", "Golem %s destroyed %s items because it finds no place to store.", 2, ChatFormatting.RED),
 	DESTROY_EXP("msg.destroy_exp", "Golem %s destroyed %s experience because it finds no place to store.", 2, ChatFormatting.RED),

src/main/java/dev/xkmc/modulargolems/init/registrate/GolemItems.java

@@ -12,20 +12,24 @@
 import dev.xkmc.modulargolems.content.entity.humanoid.HumanoidGolemEntity;
 import dev.xkmc.modulargolems.content.entity.metalgolem.MetalGolemEntity;
 import dev.xkmc.modulargolems.content.entity.metalgolem.MetalGolemPartType;
-import dev.xkmc.modulargolems.content.item.CommandWandItem;
-import dev.xkmc.modulargolems.content.item.DispenseWand;
-import dev.xkmc.modulargolems.content.item.RetrievalWandItem;
-import dev.xkmc.modulargolems.content.item.SimpleUpgradeItem;
+import dev.xkmc.modulargolems.content.item.*;
 import dev.xkmc.modulargolems.content.item.golem.GolemHolder;
 import dev.xkmc.modulargolems.content.item.golem.GolemPart;
 import dev.xkmc.modulargolems.content.modifier.base.GolemModifier;
 import dev.xkmc.modulargolems.init.ModularGolems;
+import dev.xkmc.modulargolems.init.data.MGLangData;
 import dev.xkmc.modulargolems.init.data.MGTagGen;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.TooltipFlag;
+import net.minecraft.world.level.Level;
 import net.minecraftforge.client.model.generators.ModelFile;
+import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
 import java.util.function.Supplier;
 
 import static dev.xkmc.modulargolems.init.ModularGolems.REGISTRATE;
@@ -57,14 +61,16 @@ public class GolemItems {
 	public static final ItemEntry<RetrievalWandItem> RETRIEVAL_WAND;
 	public static final ItemEntry<CommandWandItem> COMMAND_WAND;
 	public static final ItemEntry<DispenseWand> DISPENSE_WAND;
+	public static final ItemEntry<RiderWandItem> RIDER_WAND;
+
 
 	static {
 
 		GOLEM_TEMPLATE = REGISTRATE.item("metal_golem_template", Item::new).defaultModel().defaultLang().register();
 		RETRIEVAL_WAND = REGISTRATE.item("retrieval_wand", p -> new RetrievalWandItem(p.stacksTo(1))).defaultModel().defaultLang().register();
 		COMMAND_WAND = REGISTRATE.item("command_wand", p -> new CommandWandItem(p.stacksTo(1))).defaultModel().defaultLang().register();
 		DISPENSE_WAND = REGISTRATE.item("summon_wand", p -> new DispenseWand(p.stacksTo(1))).defaultModel().defaultLang().register();
-
+		RIDER_WAND = REGISTRATE.item("rider_wand", p -> new RiderWandItem(p.stacksTo(1))).defaultModel().defaultLang().register();
 		// upgrades
 		{
 			EMPTY_UPGRADE = REGISTRATE.item("empty_upgrade", Item::new).defaultModel().defaultLang().register();