Skip to content

Commit 80a36f5

Browse files
Spectrall368Spectrall368
committed
Some changes
1 parent 23cbf31 commit 80a36f5

File tree

10 files changed

+968
-694
lines changed

10 files changed

+968
-694
lines changed

‎src/main/resources/datapack-1.12.x/mappings/entities.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ _mcreator_map_template:
77
- "@JavaModNameEntities.@REGISTRYNAME.get()"
88
- "@modid:@registryname"
99
_bypass_prefix: "#"
10-
EntityAgeable: AgeableEntity
10+
EntityAgeable: EntityAgeable
1111
EntityAmbientCreature: AmbientEntity
1212
EntityAnimal: AnimalEntity
1313
EntityAreaEffectCloud:
@@ -428,7 +428,7 @@ EntityPlayer:
428428
- EntityType.PLAYER
429429
- player
430430
EntityPlayerMP:
431-
- ServerPlayerEntity
431+
- EntityPlayerMP
432432
- EntityType.PLAYER
433433
- player
434434
EntityFishHook:

‎src/main/resources/forge-1.12.2/aitasks/attack_on_collide.java.ftl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
this.tasks.addTask(${cbi+1}, new EntityAIAttackMelee(this, ${field$speed}, ${field$longmemory?lower_case}) {
33

44
@Override protected double getAttackReachSqr(EntityLivingBase entity) {
5-
return this.attacker.getWidth() * this.attacker.getWidth() + entity.getWidth();
5+
return this.attacker.width * this.attacker.width + entity.width;
66
}
77

88
<@conditionCode field$condition false/>

‎src/main/resources/forge-1.12.2/aitasks/attack_with_range.java.ftl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<#include "aiconditions.java.ftl">
22
this.tasks.addTask(${cbi+1}, new EntityAIAttackMelee(this, ${field$speed}, ${field$longmemory?lower_case}) {
33

4-
@Override protected double getAttackReachSqr(LivingEntity entity) {
4+
@Override protected double getAttackReachSqr(EntityLivingBase entity) {
55
return ${field$range?number * field$range?number};
66
}
77

‎src/main/resources/forge-1.12.2/templates/elementinits/blocks.java.ftl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ package ${package}.init;
127127
@SubscribeEvent public static void onMobJump(LivingEvent.LivingJumpEvent event) {
128128
<#compress>
129129
LivingEntity entity = event.getEntityLiving();
130-
BlockState state = entity.world.getBlockState(entity.getPosition().down());
131-
BlockState stateUp = entity.world.getBlockState(entity.getPosition());
130+
IBlockState state = entity.world.getBlockState(entity.getPosition().down());
131+
IBlockState stateUp = entity.world.getBlockState(entity.getPosition());
132132
if<#list jumpF as block>
133133
(state<#if block.getModElement().getTypeString() == "plant">Up</#if>.getBlock() instanceof ${block.getModElement().getName()}Block)
134134
entity.setMotion(entity.getMotion().mul(1.0D, ${block.jumpFactor}D, 1.0D));<#sep>else if

‎src/main/resources/forge-1.12.2/templates/elementinits/entities.java.ftl‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,23 @@ package ${package}.init;
4040

4141
@Mod.EventBusSubscriber(modid = "${modid}")
4242
public class ${JavaModName}Entities {
43-
private static final List<EntityEntry<?>> REGISTRY = new ArrayList<>();
43+
private static final List<EntityEntry> REGISTRY = new ArrayList<>();
4444

4545
<#list entities as entity>
4646
<#if entity.getModElement().getTypeString() == "projectile">
47-
public static final EntityEntry<${entity.getModElement().getName()}Entity> ${entity.getModElement().getRegistryNameUpper()} =
47+
public static final EntityEntry ${entity.getModElement().getRegistryNameUpper()} =
4848
register("${entity.getModElement().getRegistryName()}", EntityEntryBuilder.<${entity.getModElement().getName()}Entity>
4949
create(${entity.getModElement().getName()}Entity::new, EntityClassification.MISC).setCustomClientFactory(${entity.getModElement().getName()}Entity::new)
5050
.setShouldReceiveVelocityUpdates(true).setTrackingRange(64).setUpdateInterval(1).size(${entity.modelWidth}f, ${entity.modelHeight}f));
5151
<#elseif entity.getModElement().getTypeString() == "livingentity">
52-
public static final EntityEntry<${entity.getModElement().getName()}Entity> ${entity.getModElement().getRegistryNameUpper()} =
52+
public static final EntityEntry ${entity.getModElement().getRegistryNameUpper()} =
5353
register("${entity.getModElement().getRegistryName()}", EntityEntryBuilder.<${entity.getModElement().getName()}Entity>
5454
create(${entity.getModElement().getName()}Entity::new, ${generator.map(entity.mobSpawningType, "mobspawntypes")})
5555
.setShouldReceiveVelocityUpdates(true).setTrackingRange(${entity.trackingRange}).setUpdateInterval(3)
5656
.setCustomClientFactory(${entity.getModElement().getName()}Entity::new)<#if entity.immuneToFire>.immuneToFire()</#if>.size(${entity.modelWidth}f, ${entity.modelHeight}f)
5757
);
5858
<#if entity.hasCustomProjectile()>
59-
public static final EntityEntry<${entity.getModElement().getName()}EntityProjectile> ${entity.getModElement().getRegistryNameUpper()}_PROJECTILE =
59+
public static final EntityEntry ${entity.getModElement().getRegistryNameUpper()}_PROJECTILE =
6060
register("projectile_${entity.getModElement().getRegistryName()}", EntityEntryBuilder.<${entity.getModElement().getName()}EntityProjectile>
6161
create(${entity.getModElement().getName()}EntityProjectile::new, EntityClassification.MISC).setShouldReceiveVelocityUpdates(true).setTrackingRange(64)
6262
.setUpdateInterval(1).setCustomClientFactory(${entity.getModElement().getName()}EntityProjectile::new).size(0.5f, 0.5f));
@@ -67,13 +67,14 @@ public class ${JavaModName}Entities {
6767
// Start of user code block custom entities
6868
// End of user code block custom entities
6969

70-
private static <T extends Entity> EntityEntry<T> register(String registryname, EntityEntryBuilder<T> entityTypeBuilder) {
71-
REGISTRY.add(entityTypeBuilder.build().setRegistryName(new ResourceLocation(${JavaModName}.MODID, registryname)));
72-
return enchantment;
70+
private static <T extends Entity> EntityEntry register(String registryname, EntityEntryBuilder<T> entityTypeBuilder) {
71+
EntityEntry entry = entityTypeBuilder.build().setRegistryName(new ResourceLocation(${JavaModName}.MODID, registryname));
72+
REGISTRY.add(entry);
73+
return entry;
7374
}
7475

75-
@SubscribeEvent public static void registerEntities(RegistryEvent.Register<EntityType<?>> event) {
76-
event.getRegistry().registerAll(REGISTRY.toArray(new EntityType[0]));
76+
@SubscribeEvent public static void registerEntities(RegistryEvent.Register<EntityEntry> event) {
77+
event.getRegistry().registerAll(REGISTRY.toArray(new EntityEntry[0]));
7778
}
7879

7980
<#if hasLivingEntities>

‎src/main/resources/forge-1.12.2/templates/elementinits/items.java.ftl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ package ${package}.init;
101101
</#if>
102102
<#elseif item.getModElement().getTypeString() == "livingentity">
103103
public static final Item ${item.getModElement().getRegistryNameUpper()}_SPAWN_EGG =
104-
register("${item.getModElement().getRegistryName()}_spawn_egg", () -> new SpawnEggItem(${JavaModName}Entities.${item.getModElement().getRegistryNameUpper()}.get(),
104+
register("${item.getModElement().getRegistryName()}_spawn_egg", () -> new ItemMonsterPlacer(${JavaModName}Entities.${item.getModElement().getRegistryNameUpper()}.get(),
105105
${item.spawnEggBaseColor.getRGB()}, ${item.spawnEggDotColor.getRGB()}, new Item.Properties().group(<@CreativeTabs item.creativeTabs/>)));
106106
<#elseif item.getModElement().getTypeString() == "dimension" && item.hasIgniter()>
107107
public static final Item ${item.getModElement().getRegistryNameUpper()} =

0 commit comments

Comments
 (0)