mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 03:49:14 +00:00
Update to 1.17
Update to Official classnames Patchwork Make the game compile and run Merge in the new HUD overlay API Merge in the new render properties API PEEL Use Gradle 7.2 snapshot to fix eclipse integration bug in 7.1, Would use 7.0 but FG needs 7.1 for some reason. New FML installer Update to 1.17.1 Co-authored-by: LexManos <[email protected]> Co-authored-by: SizableShrimp <[email protected]> Co-authored-by: cpw <[email protected]> Co-authored-by: Curle <[email protected]> Co-authored-by: Unnoen <[email protected]> Co-authored-by: covers1624 <[email protected]> Co-authored-by: DaemonUmbra <[email protected]> Co-authored-by: gigaherz <[email protected]> Signed-off-by: SizableShrimp <[email protected]>
This commit is contained in:
1 parent
064ae6961b
commit
be5446b91c
1990 files changed
+35661
-37544
No files matched your search
@@ -19,11 +19,11 @@
|
||||
|
||||
package net.minecraftforge.debug.entity;
|
||||
|
||||
import net.minecraft.entity.ai.attributes.Attribute;
|
||||
import net.minecraft.entity.ai.attributes.RangedAttribute;
|
||||
import net.minecraft.world.entity.ai.attributes.Attribute;
|
||||
import net.minecraft.world.entity.ai.attributes.RangedAttribute;
|
||||
import net.minecraftforge.event.entity.EntityAttributeModificationEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.RegistryObject;
|
||||
import net.minecraftforge.fmllegacy.RegistryObject;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import net.minecraftforge.registries.DeferredRegister;
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
|
||||
package net.minecraftforge.debug.entity;
|
||||
|
||||
import net.minecraft.entity.EntityClassification;
|
||||
import net.minecraft.world.entity.MobCategory;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
|
||||
@Mod("create_entity_classification_test")
|
||||
public class CreateEntityClassificationTest
|
||||
{
|
||||
public static EntityClassification test = EntityClassification.create("TEST", "test", 1, true, true, 128);
|
||||
public static MobCategory test = MobCategory.create("TEST", "test", 1, true, true, 128);
|
||||
}
|
||||
@@ -20,7 +20,7 @@
|
||||
package net.minecraftforge.debug.entity;
|
||||
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.living.EntityTeleportEvent;
|
||||
import net.minecraftforge.event.entity.EntityTeleportEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
|
||||
|
||||
@@ -19,12 +19,12 @@
|
||||
|
||||
package net.minecraftforge.debug.entity;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.projectile.FishingBobberEntity;
|
||||
import net.minecraft.util.math.EntityRayTraceResult;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.util.math.vector.Vector3d;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.entity.projectile.FishingHook;
|
||||
import net.minecraft.world.phys.EntityHitResult;
|
||||
import net.minecraft.world.phys.HitResult;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.ProjectileImpactEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
@@ -43,19 +43,19 @@ public class FishingBobberEventTest
|
||||
}
|
||||
}
|
||||
|
||||
public static void handleImpact(ProjectileImpactEvent.FishingBobber event)
|
||||
public static void handleImpact(ProjectileImpactEvent<FishingHook> event)
|
||||
{
|
||||
FishingBobberEntity bob = event.getFishingBobber();
|
||||
RayTraceResult trace = event.getRayTraceResult();
|
||||
if (trace.getType() == RayTraceResult.Type.ENTITY)
|
||||
FishingHook fishingHook = event.getProjectile();
|
||||
HitResult trace = event.getRayTraceResult();
|
||||
if (trace.getType() == HitResult.Type.ENTITY)
|
||||
{
|
||||
Vector3d vector3d = bob.getDeltaMovement().multiply(1.0D, 0.0D, 1.0D).normalize().scale(0.6);
|
||||
Vec3 vector3d = fishingHook.getDeltaMovement().multiply(1.0D, 0.0D, 1.0D).normalize().scale(0.6);
|
||||
if (vector3d.lengthSqr() > 0.0D)
|
||||
{
|
||||
Entity entity = ((EntityRayTraceResult) trace).getEntity();
|
||||
Entity entity = ((EntityHitResult) trace).getEntity();
|
||||
if (entity instanceof LivingEntity)
|
||||
{
|
||||
((LivingEntity) entity).push(vector3d.x, 0.3D, vector3d.z);
|
||||
entity.push(vector3d.x, 0.3D, vector3d.z);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,27 +24,28 @@ import java.util.List;
|
||||
import java.util.UUID;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
import java.util.stream.StreamSupport;
|
||||
|
||||
import net.minecraft.entity.ai.attributes.ModifiableAttributeInstance;
|
||||
import net.minecraft.world.entity.ai.attributes.AttributeInstance;
|
||||
import net.minecraftforge.common.ForgeMod;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import net.minecraft.client.world.ClientWorld;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.ai.attributes.Attribute;
|
||||
import net.minecraft.entity.ai.attributes.AttributeModifier;
|
||||
import net.minecraft.entity.ai.attributes.AttributeModifier.Operation;
|
||||
import net.minecraft.inventory.EquipmentSlotType;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemGroup;
|
||||
import net.minecraft.item.Rarity;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.biome.Biome.Category;
|
||||
import net.minecraft.world.server.ServerWorld;
|
||||
import net.minecraft.client.multiplayer.ClientLevel;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.entity.ai.attributes.Attribute;
|
||||
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
|
||||
import net.minecraft.world.entity.ai.attributes.AttributeModifier.Operation;
|
||||
import net.minecraft.world.entity.EquipmentSlot;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.CreativeModeTab;
|
||||
import net.minecraft.world.item.Rarity;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.biome.Biome.BiomeCategory;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.RegistryEvent;
|
||||
import net.minecraftforge.event.TickEvent;
|
||||
@@ -52,7 +53,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
|
||||
import net.minecraft.item.Item.Properties;
|
||||
import net.minecraft.world.item.Item.Properties;
|
||||
|
||||
@Mod("gravity_attribute_test")
|
||||
public class GravityAttributeTest
|
||||
@@ -81,11 +82,11 @@ public class GravityAttributeTest
|
||||
if (ticks++ > 60)
|
||||
{
|
||||
ticks = 0;
|
||||
World w = event.world;
|
||||
Level w = event.world;
|
||||
List<LivingEntity> list;
|
||||
if(w.isClientSide)
|
||||
{
|
||||
ClientWorld cw = (ClientWorld)w;
|
||||
ClientLevel cw = (ClientLevel)w;
|
||||
list = new ArrayList<>(100);
|
||||
for(Entity e : cw.entitiesForRendering())
|
||||
{
|
||||
@@ -95,15 +96,18 @@ public class GravityAttributeTest
|
||||
}
|
||||
else
|
||||
{
|
||||
ServerWorld sw = (ServerWorld)w;
|
||||
Stream<LivingEntity> s = sw.getEntities().filter(Entity::isAlive).filter(e -> e instanceof LivingEntity).map(e -> (LivingEntity)e);
|
||||
ServerLevel sw = (ServerLevel)w;
|
||||
Stream<LivingEntity> s = StreamSupport.stream(sw.getEntities().getAll().spliterator(), false)
|
||||
.filter(Entity::isAlive)
|
||||
.filter(e -> e instanceof LivingEntity)
|
||||
.map(e -> (LivingEntity)e);
|
||||
list = s.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
for(LivingEntity liv : list)
|
||||
{
|
||||
ModifiableAttributeInstance grav = liv.getAttribute(ForgeMod.ENTITY_GRAVITY.get());
|
||||
boolean inPlains = liv.level.getBiome(liv.blockPosition()).getBiomeCategory() == Category.PLAINS;
|
||||
AttributeInstance grav = liv.getAttribute(ForgeMod.ENTITY_GRAVITY.get());
|
||||
boolean inPlains = liv.level.getBiome(liv.blockPosition()).getBiomeCategory() == BiomeCategory.PLAINS;
|
||||
if (inPlains && !grav.hasModifier(REDUCED_GRAVITY))
|
||||
{
|
||||
logger.info("Granted low gravity to Entity: {}", liv);
|
||||
@@ -123,7 +127,7 @@ public class GravityAttributeTest
|
||||
@SubscribeEvent
|
||||
public void registerItems(RegistryEvent.Register<Item> event)
|
||||
{
|
||||
event.getRegistry().register(new ItemGravityStick(new Item.Properties().tab(ItemGroup.TAB_TOOLS).rarity(Rarity.RARE)).setRegistryName("gravity_attribute_test:gravity_stick"));
|
||||
event.getRegistry().register(new ItemGravityStick(new Properties().tab(CreativeModeTab.TAB_TOOLS).rarity(Rarity.RARE)).setRegistryName("gravity_attribute_test:gravity_stick"));
|
||||
}
|
||||
|
||||
public static class ItemGravityStick extends Item
|
||||
@@ -136,11 +140,11 @@ public class GravityAttributeTest
|
||||
}
|
||||
|
||||
@Override
|
||||
public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(EquipmentSlotType slot)
|
||||
public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(EquipmentSlot slot)
|
||||
{
|
||||
@SuppressWarnings("deprecation")
|
||||
Multimap<Attribute, AttributeModifier> multimap = super.getDefaultAttributeModifiers(slot);
|
||||
if (slot == EquipmentSlotType.MAINHAND)
|
||||
if (slot == EquipmentSlot.MAINHAND)
|
||||
multimap.put(ForgeMod.ENTITY_GRAVITY.get(), new AttributeModifier(GRAVITY_MODIFIER, "More Gravity", 1.0D, Operation.ADDITION));
|
||||
|
||||
return multimap;
|
||||
|
||||
@@ -19,10 +19,10 @@
|
||||
|
||||
package net.minecraftforge.debug.entity.living;
|
||||
|
||||
import net.minecraft.entity.merchant.villager.VillagerEntity;
|
||||
import net.minecraft.entity.monster.piglin.PiglinEntity;
|
||||
import net.minecraft.potion.EffectInstance;
|
||||
import net.minecraft.potion.Effects;
|
||||
import net.minecraft.world.entity.npc.Villager;
|
||||
import net.minecraft.world.entity.monster.piglin.Piglin;
|
||||
import net.minecraft.world.effect.MobEffectInstance;
|
||||
import net.minecraft.world.effect.MobEffects;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.living.LivingConversionEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
@@ -38,7 +38,7 @@ public class LivingConversionEventTest
|
||||
|
||||
public void canLivingConversion(LivingConversionEvent.Pre event)
|
||||
{
|
||||
if (event.getEntityLiving() instanceof PiglinEntity)
|
||||
if (event.getEntityLiving() instanceof Piglin)
|
||||
{
|
||||
event.setCanceled(true);
|
||||
event.setConversionTimer(0);
|
||||
@@ -47,7 +47,7 @@ public class LivingConversionEventTest
|
||||
|
||||
public void onLivingConversion(LivingConversionEvent.Post event)
|
||||
{
|
||||
if (event.getEntityLiving() instanceof VillagerEntity)
|
||||
event.getEntityLiving().addEffect(new EffectInstance(Effects.LUCK, 20));
|
||||
if (event.getEntityLiving() instanceof Villager)
|
||||
event.getEntityLiving().addEffect(new MobEffectInstance(MobEffects.LUCK, 20));
|
||||
}
|
||||
}
|
||||
@@ -22,4 +22,4 @@
|
||||
package net.minecraftforge.debug.entity;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
import net.minecraft.MethodsReturnNonnullByDefault;
|
||||
+15
-11
@@ -21,15 +21,19 @@ package net.minecraftforge.debug.entity.player;
|
||||
|
||||
import com.google.common.collect.ArrayListMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
import net.minecraft.entity.ai.attributes.Attribute;
|
||||
import net.minecraft.entity.ai.attributes.AttributeModifier;
|
||||
import net.minecraft.entity.ai.attributes.Attributes;
|
||||
import net.minecraft.inventory.EquipmentSlotType;
|
||||
import net.minecraft.item.*;
|
||||
import net.minecraft.world.entity.EquipmentSlot;
|
||||
import net.minecraft.world.entity.ai.attributes.Attribute;
|
||||
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
|
||||
import net.minecraft.world.entity.ai.attributes.Attributes;
|
||||
import net.minecraft.world.item.CreativeModeTab;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.SwordItem;
|
||||
import net.minecraft.world.item.Tier;
|
||||
import net.minecraft.world.item.Tiers;
|
||||
import net.minecraftforge.eventbus.api.IEventBus;
|
||||
import net.minecraftforge.fml.RegistryObject;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import net.minecraftforge.fmllegacy.RegistryObject;
|
||||
import net.minecraftforge.registries.DeferredRegister;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
|
||||
@@ -51,7 +55,7 @@ public class PlayerAttackKnockbackTest {
|
||||
static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
|
||||
|
||||
static RegistryObject<Item> KNOCKBACK_SWORD = ITEMS.register("knockback_sword", () ->
|
||||
new KnockbackSwordItem(ItemTier.IRON, 3, -2.4F, ATTACK_KNOCKBACK_VALUE, (new Item.Properties()).tab(ItemGroup.TAB_COMBAT))
|
||||
new KnockbackSwordItem(Tiers.IRON, 3, -2.4F, ATTACK_KNOCKBACK_VALUE, (new Item.Properties()).tab(CreativeModeTab.TAB_COMBAT))
|
||||
);
|
||||
|
||||
public PlayerAttackKnockbackTest()
|
||||
@@ -60,19 +64,19 @@ public class PlayerAttackKnockbackTest {
|
||||
ITEMS.register(modEventBus);
|
||||
}
|
||||
|
||||
static class KnockbackSwordItem extends SwordItem{
|
||||
static class KnockbackSwordItem extends SwordItem {
|
||||
private final float attackKnockback;
|
||||
private final Multimap<Attribute, AttributeModifier> defaultModifiers = ArrayListMultimap.create(); // initialize as empty
|
||||
protected static final UUID BASE_ATTACK_KNOCKBACK_UUID = UUID.fromString("01efce91-ab3a-4163-b464-5c7bd1ae5496");
|
||||
|
||||
KnockbackSwordItem(IItemTier itemTier, int attackDamageIn, float attackSpeedIn, float attackKnockbackIn, Properties properties) {
|
||||
KnockbackSwordItem(Tier itemTier, int attackDamageIn, float attackSpeedIn, float attackKnockbackIn, Properties properties) {
|
||||
super(itemTier, attackDamageIn, attackSpeedIn, properties);
|
||||
this.attackKnockback = attackKnockbackIn;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(EquipmentSlotType equipmentSlotType) {
|
||||
if(equipmentSlotType == EquipmentSlotType.MAINHAND){
|
||||
public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(EquipmentSlot equipmentSlotType) {
|
||||
if(equipmentSlotType == EquipmentSlot.MAINHAND){
|
||||
if(this.defaultModifiers.isEmpty()){
|
||||
Multimap<Attribute, AttributeModifier> oldAttributeModifiers = super.getDefaultAttributeModifiers(equipmentSlotType);
|
||||
this.defaultModifiers.putAll(oldAttributeModifiers);
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
package net.minecraftforge.debug.entity.player;
|
||||
|
||||
import net.minecraft.world.GameType;
|
||||
import net.minecraft.world.level.GameType;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.client.event.ClientPlayerChangeGameModeEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerEvent;
|
||||
@@ -44,7 +44,7 @@ public class PlayerGameModeEventTest
|
||||
if (event.getNewGameMode() == GameType.SURVIVAL)
|
||||
event.setCanceled(true);
|
||||
}
|
||||
|
||||
|
||||
@Mod.EventBusSubscriber(modid="player_game_mode_event_test", value=Dist.CLIENT, bus=Mod.EventBusSubscriber.Bus.FORGE)
|
||||
public static class PlayerGameModeEventTestClientForgeEvents
|
||||
{
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
package net.minecraftforge.debug.entity.player;
|
||||
|
||||
import net.minecraft.util.text.StringTextComponent;
|
||||
import net.minecraft.network.chat.TextComponent;
|
||||
import net.minecraftforge.event.entity.player.PlayerEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
@@ -34,6 +34,6 @@ public class PlayerNameEventTest
|
||||
public static void onPlayerNameEvent(PlayerEvent.NameFormat event)
|
||||
{
|
||||
if (!ENABLE) return;
|
||||
event.setDisplayname(new StringTextComponent("Test Name"));
|
||||
event.setDisplayname(new TextComponent("Test Name"));
|
||||
}
|
||||
}
|
||||
@@ -22,4 +22,4 @@
|
||||
package net.minecraftforge.debug.entity.player;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
import net.minecraft.MethodsReturnNonnullByDefault;
|
||||
Reference in new issue
Block a user