Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
71883d93e9
|
||
|
|
fc33eea2e5
|
||
|
|
301d8b192a
|
No files matched your search
+4
-8
@@ -14,7 +14,7 @@ base {
|
||||
}
|
||||
|
||||
java {
|
||||
toolchain.languageVersion = JavaLanguageVersion.of(17)
|
||||
toolchain.languageVersion = JavaLanguageVersion.of(21)
|
||||
}
|
||||
|
||||
minecraft {
|
||||
@@ -31,7 +31,7 @@ minecraft {
|
||||
//
|
||||
// Use non-default mappings at your own risk. They may not always work.
|
||||
// Simply re-run your setup task after changing the mappings to update your workspace.
|
||||
mappings channel: 'parchment', version: '2024.04.14-1.20.4'
|
||||
mappings channel: 'parchment', version: '2024.06.16-1.20.6'
|
||||
|
||||
// When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game.
|
||||
// In most cases, it is not necessary to enable.
|
||||
@@ -75,12 +75,6 @@ minecraft {
|
||||
// You can set various levels here.
|
||||
// Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
|
||||
property 'forge.logging.console.level', 'debug'
|
||||
|
||||
mods {
|
||||
"${mod_id}" {
|
||||
source sourceSets.main
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
client {
|
||||
@@ -146,6 +140,8 @@ dependencies {
|
||||
// For more info:
|
||||
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
|
||||
// http://www.gradle.org/docs/current/userguide/dependency_management.html
|
||||
|
||||
implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
|
||||
}
|
||||
|
||||
// This block of code expands all declared replace properties in the specified resource targets.
|
||||
|
||||
+6
-6
@@ -1,17 +1,17 @@
|
||||
org.gradle.jvmargs=-Xmx3G
|
||||
org.gradle.daemon=false
|
||||
# The Minecraft version must agree with the Forge version to get a valid artifact
|
||||
minecraft_version=1.20.3
|
||||
minecraft_version=1.20.6
|
||||
# The Minecraft version range can use any release version of Minecraft as bounds.
|
||||
# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
|
||||
# as they do not follow standard versioning conventions.
|
||||
minecraft_version_range=[1.20.3, 1.20.4]
|
||||
minecraft_version_range=[1.20.6]
|
||||
# The Forge version must agree with the Minecraft version to get a valid artifact
|
||||
forge_version=49.0.2
|
||||
forge_version=50.1.0
|
||||
# The Forge version range can use any version of Forge as bounds or match the loader version range
|
||||
forge_version_range=[49,)
|
||||
forge_version_range=[50,)
|
||||
# The loader version range can only use the major version of Forge/FML as bounds
|
||||
loader_version_range=[49,)
|
||||
loader_version_range=[50,)
|
||||
# The mapping channel to use for mappings.
|
||||
# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
|
||||
# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
|
||||
@@ -29,7 +29,7 @@ loader_version_range=[49,)
|
||||
mapping_channel=official
|
||||
# The mapping version to query from the mapping channel.
|
||||
# This must match the format required by the mapping channel.
|
||||
mapping_version=1.20.3
|
||||
mapping_version=1.20.6
|
||||
# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
|
||||
# Must match the String constant located in the main mod class annotated with @Mod.
|
||||
mod_id=advancedarrows
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.jenny.advancedarrows.entities;
|
||||
|
||||
import net.minecraft.core.particles.ParticleTypes;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
@@ -39,23 +38,20 @@ public class baseArrow extends AbstractArrow {
|
||||
|
||||
@NotNull
|
||||
protected ItemStack getPickupItem() {
|
||||
System.out.println(itemPickup.toString());
|
||||
return itemPickup.getDefaultInstance();
|
||||
}
|
||||
|
||||
public void handleEntityEvent(byte pId) {
|
||||
if (pId == 0) {
|
||||
int i = -1;
|
||||
if (i != -1) {
|
||||
double d0 = (double)(i >> 16 & 255) / 255.0D;
|
||||
double d1 = (double)(i >> 8 & 255) / 255.0D;
|
||||
double d2 = (double)(i >> 0 & 255) / 255.0D;
|
||||
|
||||
for(int j = 0; j < 20; ++j) {
|
||||
this.level().addParticle(ParticleTypes.ENTITY_EFFECT, this.getRandomX(0.5D), this.getRandomY(), this.getRandomZ(0.5D), d0, d1, d2);
|
||||
}
|
||||
}
|
||||
@Override
|
||||
protected @NotNull ItemStack getDefaultPickupItem() {
|
||||
if (itemPickup == null) {
|
||||
return ItemStack.EMPTY;
|
||||
} else {
|
||||
return new ItemStack(itemPickup);
|
||||
}
|
||||
}
|
||||
|
||||
public void handleEntityEvent(byte pId) {
|
||||
if (pId != 0) {
|
||||
super.handleEntityEvent(pId);
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,8 @@ public class incendiaryArrow extends baseArrow{
|
||||
|
||||
@Override
|
||||
protected void doPostHurtEffects(@NotNull LivingEntity pTarget) {
|
||||
pTarget.setSecondsOnFire(5);
|
||||
pTarget.setSharedFlagOnFire(true);
|
||||
pTarget.setRemainingFireTicks(100);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -10,7 +10,6 @@ import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.TooltipFlag;
|
||||
import net.minecraft.world.level.Level;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -22,12 +21,12 @@ public abstract class ArrowAbstract extends ArrowItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void appendHoverText(@NotNull ItemStack pStack, @Nullable Level pLevel, @NotNull List<Component> pTooltipComponents, @NotNull TooltipFlag pIsAdvanced) {
|
||||
public void appendHoverText(@NotNull ItemStack pStack, @NotNull TooltipContext pContext, @NotNull List<Component> pTooltipComponents, @NotNull TooltipFlag pTooltipFlag) {
|
||||
String key = String.format("tooltip.%s.%s", MODID, this);
|
||||
MutableComponent toolTip = Component.translatable(key);
|
||||
if (!toolTip.getString().equals(key)) {
|
||||
pTooltipComponents.add(toolTip.withStyle(ChatFormatting.DARK_BLUE));
|
||||
super.appendHoverText(pStack, pLevel, pTooltipComponents, pIsAdvanced);
|
||||
super.appendHoverText(pStack, pContext, pTooltipComponents, pTooltipFlag);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2,15 +2,17 @@ package com.jenny.advancedarrows.items;
|
||||
|
||||
import com.jenny.advancedarrows.entities.baseArrow;
|
||||
import com.jenny.advancedarrows.entities.entities;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.Position;
|
||||
import net.minecraft.core.dispenser.AbstractProjectileDispenseBehavior;
|
||||
import net.minecraft.core.dispenser.BlockSource;
|
||||
import net.minecraft.core.dispenser.DefaultDispenseItemBehavior;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
import net.minecraft.world.entity.projectile.AbstractArrow;
|
||||
import net.minecraft.world.entity.projectile.Projectile;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.block.DispenserBlock;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import net.minecraftforge.eventbus.api.IEventBus;
|
||||
import net.minecraftforge.registries.DeferredRegister;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
@@ -37,30 +39,46 @@ public class items {
|
||||
|
||||
|
||||
public static void registerDispenser() {
|
||||
class ArrowDispenseBehaviour extends AbstractProjectileDispenseBehavior {
|
||||
class ArrowDispenseBehaviour extends DefaultDispenseItemBehavior {
|
||||
private final ArrowAbstract.DispenseConfig dispenseConfig;
|
||||
private final EntityType<? extends baseArrow> arrowType;
|
||||
|
||||
public ArrowDispenseBehaviour(EntityType<? extends baseArrow> arrow) {
|
||||
public ArrowDispenseBehaviour(@NotNull ArrowAbstract arrowItem, EntityType<? extends baseArrow> arrow) {
|
||||
this.dispenseConfig = arrowItem.createDispenseConfig();
|
||||
this.arrowType = arrow;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected @NotNull Projectile getProjectile(@NotNull Level pLevel, @NotNull Position pPosition, @NotNull ItemStack pStack) {
|
||||
baseArrow arrow = arrowType.create(pLevel);
|
||||
assert arrow != null;
|
||||
arrow.setPos(pPosition.x(), pPosition.y(), pPosition.z());
|
||||
arrow.pickup = AbstractArrow.Pickup.ALLOWED;
|
||||
return arrow;
|
||||
public @NotNull ItemStack execute(@NotNull BlockSource pBlockSource, @NotNull ItemStack pItem) {
|
||||
Level level = pBlockSource.level();
|
||||
Direction dir = pBlockSource.state().getValue(DispenserBlock.FACING);
|
||||
Position pos = this.dispenseConfig.positionFunction().getDispensePosition(pBlockSource, dir);
|
||||
|
||||
AbstractArrow arrowEntity = arrowType.create(level);
|
||||
assert arrowEntity != null;
|
||||
arrowEntity.setPos(new Vec3(pos.x(), pos.y(), pos.z()));
|
||||
arrowEntity.setDeltaMovement(dir.getStepX(), dir.getStepY(), dir.getStepZ());
|
||||
level.addFreshEntity(arrowEntity);
|
||||
pItem.shrink(1);
|
||||
return pItem;
|
||||
}
|
||||
}
|
||||
|
||||
DispenserBlock.registerBehavior(ARROW_INCENDIARY.get(), new ArrowDispenseBehaviour(entities.ARROW_INCENDIARY.get()));
|
||||
DispenserBlock.registerBehavior(ARROW_RICOCHET.get(), new ArrowDispenseBehaviour(entities.ARROW_RICOCHET.get()));
|
||||
DispenserBlock.registerBehavior(ARROW_KINETIC.get(), new ArrowDispenseBehaviour(entities.ARROW_KINETIC.get()));
|
||||
DispenserBlock.registerBehavior(ARROW_SHARPENED.get(), new ArrowDispenseBehaviour(entities.ARROW_SHARPENED.get()));
|
||||
DispenserBlock.registerBehavior(ARROW_SWITCH.get(), new ArrowDispenseBehaviour(entities.ARROW_SWITCH.get()));
|
||||
DispenserBlock.registerBehavior(ARROW_BREACHING.get(), new ArrowDispenseBehaviour(entities.ARROW_BREACHING.get()));
|
||||
DispenserBlock.registerBehavior(ARROW_HOMING.get(), new ArrowDispenseBehaviour(entities.ARROW_HOMING.get()));
|
||||
DispenserBlock.registerBehavior(ARROW_ENDER.get(), new ArrowDispenseBehaviour(entities.ARROW_ENDER.get()));
|
||||
DispenserBlock.registerBehavior(ARROW_INCENDIARY.get(), new ArrowDispenseBehaviour(
|
||||
(ArrowAbstract) items.ARROW_INCENDIARY.get(), entities.ARROW_INCENDIARY.get()));
|
||||
DispenserBlock.registerBehavior(ARROW_RICOCHET.get(), new ArrowDispenseBehaviour(
|
||||
(ArrowAbstract) items.ARROW_RICOCHET.get(), entities.ARROW_RICOCHET.get()));
|
||||
DispenserBlock.registerBehavior(ARROW_KINETIC.get(), new ArrowDispenseBehaviour(
|
||||
(ArrowAbstract) items.ARROW_KINETIC.get(), entities.ARROW_KINETIC.get()));
|
||||
DispenserBlock.registerBehavior(ARROW_SHARPENED.get(), new ArrowDispenseBehaviour(
|
||||
(ArrowAbstract) items.ARROW_SHARPENED.get(), entities.ARROW_SHARPENED.get()));
|
||||
DispenserBlock.registerBehavior(ARROW_SWITCH.get(), new ArrowDispenseBehaviour(
|
||||
(ArrowAbstract) items.ARROW_SWITCH.get(), entities.ARROW_SWITCH.get()));
|
||||
DispenserBlock.registerBehavior(ARROW_BREACHING.get(), new ArrowDispenseBehaviour(
|
||||
(ArrowAbstract) items.ARROW_BREACHING.get(), entities.ARROW_BREACHING.get()));
|
||||
DispenserBlock.registerBehavior(ARROW_HOMING.get(), new ArrowDispenseBehaviour(
|
||||
(ArrowAbstract) items.ARROW_HOMING.get(), entities.ARROW_HOMING.get()));
|
||||
DispenserBlock.registerBehavior(ARROW_ENDER.get(), new ArrowDispenseBehaviour(
|
||||
(ArrowAbstract) items.ARROW_ENDER.get(), entities.ARROW_ENDER.get()));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user