flewkey/flan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to forge 41.1.0

Browse Source
This commit is contained in:
Flemmli97 2022-07-27 18:13:46 +02:00
parent d63b3c7fda
commit 6119022aa0
11 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Changelog.md
View File

@ -1,3 +1,11 @@
Flan 1.8.0
================
- Update to forge 41.1.0
- New command #167:
/flan expand <x>
tries expanding the claim by x blocks into the direction the player is looking
- Display remaining claim blocks at various messages #170
Flan 1.7.10
================
- Check for keep inventory when deciding if drops should be locked or not

3
common/src/main/java/io/github/flemmli97/flan/player/PlayerClaimData.java
View File

@ -125,8 +125,7 @@ public class PlayerClaimData implements IPlayerData {
public boolean canUseClaimBlocks(int amount) {
if (ConfigHandler.config.maxClaimBlocks == -1)
return true;
int usedClaimsBlocks = this.usedClaimBlocks();
return usedClaimsBlocks + amount <= this.claimBlocks + this.additionalClaimBlocks;
return amount <= this.remainingClaimBlocks();
}
@Override

2
forge/build.gradle
View File

@ -40,7 +40,7 @@ dependencies {
shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
modCompileOnly("dev.ftb.mods:ftb-ranks-forge:${ftb_ranks}")
modImplementation(dicemcmm)
modCompileOnly(dicemcmm)
}
processResources {

14
forge/src/main/java/io/github/flemmli97/flan/forge/forgeevent/BlockInteractEventsForge.java
View File

@ -7,27 +7,27 @@ import net.minecraft.world.InteractionResult;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.Level;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.event.world.BlockEvent;
import net.minecraftforge.event.level.BlockEvent;
import net.minecraftforge.eventbus.api.Event;
public class BlockInteractEventsForge {
public static void startBreakBlocks(PlayerInteractEvent.LeftClickBlock event) {
if (!(event.getWorld() instanceof ServerLevel))
if (!(event.getLevel() instanceof ServerLevel))
return;
if (BlockInteractEvents.startBreakBlocks(event.getPlayer(), event.getWorld(), event.getHand(), event.getPos(), event.getFace()) == InteractionResult.FAIL)
if (BlockInteractEvents.startBreakBlocks(event.getEntity(), event.getLevel(), event.getHand(), event.getPos(), event.getFace()) == InteractionResult.FAIL)
event.setCanceled(true);
}
public static void breakBlocks(BlockEvent.BreakEvent event) {
if (!(event.getWorld() instanceof ServerLevel))
if (!(event.getLevel() instanceof ServerLevel))
return;
if (!BlockInteractEvents.breakBlocks((Level) event.getWorld(), event.getPlayer(), event.getPos(), event.getState(), event.getWorld().getBlockEntity(event.getPos())))
if (!BlockInteractEvents.breakBlocks((Level) event.getLevel(), event.getPlayer(), event.getPos(), event.getState(), event.getLevel().getBlockEntity(event.getPos())))
event.setCanceled(true);
}
public static void useBlocks(PlayerInteractEvent.RightClickBlock event) {
InteractionResult res = BlockInteractEvents.useBlocks(event.getPlayer(), event.getWorld(), event.getHand(), event.getHitVec());
InteractionResult res = BlockInteractEvents.useBlocks(event.getEntity(), event.getLevel(), event.getHand(), event.getHitVec());
if (res == InteractionResult.SUCCESS) {
event.setCancellationResult(res);
event.setCanceled(true);
@ -35,7 +35,7 @@ public class BlockInteractEventsForge {
}
if (res == InteractionResult.FAIL)
event.setUseBlock(Event.Result.DENY);
res = ItemInteractEvents.onItemUseBlock(new UseOnContext(event.getPlayer(), event.getHand(), event.getHitVec()));
res = ItemInteractEvents.onItemUseBlock(new UseOnContext(event.getEntity(), event.getHand(), event.getHitVec()));
if (res == InteractionResult.FAIL)
event.setUseItem(Event.Result.DENY);
}

10
forge/src/main/java/io/github/flemmli97/flan/forge/forgeevent/EntityInteractEventsForge.java
View File

@ -20,7 +20,7 @@ import net.minecraftforge.eventbus.api.Event;
public class EntityInteractEventsForge {
public static void attackEntity(AttackEntityEvent event) {
InteractionResult result = EntityInteractEvents.attackSimple(event.getPlayer(), event.getTarget(), true);
InteractionResult result = EntityInteractEvents.attackSimple(event.getEntity(), event.getTarget(), true);
if (result == InteractionResult.FAIL) {
event.setCanceled(true);
}
@ -28,7 +28,7 @@ public class EntityInteractEventsForge {
public static void useAtEntity(PlayerInteractEvent.EntityInteractSpecific event) {
Entity target = event.getTarget();
InteractionResult result = EntityInteractEvents.useAtEntity(event.getPlayer(), event.getWorld(), event.getHand(), target,
InteractionResult result = EntityInteractEvents.useAtEntity(event.getEntity(), event.getLevel(), event.getHand(), target,
new EntityHitResult(target, event.getLocalPos().add(target.getX(), target.getY(), target.getZ())));
if (result != InteractionResult.PASS) {
event.setCancellationResult(result);
@ -37,7 +37,7 @@ public class EntityInteractEventsForge {
}
public static void useEntity(PlayerInteractEvent.EntityInteract event) {
InteractionResult result = EntityInteractEvents.useEntity(event.getPlayer(), event.getWorld(), event.getHand(), event.getTarget());
InteractionResult result = EntityInteractEvents.useEntity(event.getEntity(), event.getLevel(), event.getHand(), event.getTarget());
if (result != InteractionResult.PASS) {
event.setCancellationResult(result);
event.setCanceled(true);
@ -61,13 +61,13 @@ public class EntityInteractEventsForge {
}
public static void xpAbsorb(PlayerXpEvent.PickupXp event) {
boolean prevent = EntityInteractEvents.xpAbsorb(event.getPlayer());
boolean prevent = EntityInteractEvents.xpAbsorb(event.getEntity());
if (prevent)
event.setCanceled(true);
}
public static void canDropItem(ItemTossEvent event) {
boolean canDrop = EntityInteractEvents.canDropItem(event.getPlayer(), event.getEntityItem().getItem());
boolean canDrop = EntityInteractEvents.canDropItem(event.getPlayer(), event.getEntity().getItem());
if (!canDrop) {
event.setCanceled(true);
}

2
forge/src/main/java/io/github/flemmli97/flan/forge/forgeevent/ItemInteractEventsForge.java
View File

@ -9,7 +9,7 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent;
public class ItemInteractEventsForge {
public static void useItem(PlayerInteractEvent.RightClickItem event) {
InteractionResultHolder<ItemStack> result = ItemInteractEvents.useItem(event.getPlayer(), event.getWorld(), event.getHand());
InteractionResultHolder<ItemStack> result = ItemInteractEvents.useItem(event.getEntity(), event.getLevel(), event.getHand());
if (result.getResult() != InteractionResult.PASS) {
event.setCanceled(true);
event.setCancellationResult(result.getResult());

12
forge/src/main/java/io/github/flemmli97/flan/forge/forgeevent/ServerEvents.java
View File

@ -29,19 +29,19 @@ public class ServerEvents {
}
public static void savePlayer(PlayerEvent.SaveToFile event) {
PlayerEvents.saveClaimData(event.getPlayer());
PlayerEvents.saveClaimData(event.getEntity());
}
public static void readPlayer(PlayerEvent.LoadFromFile event) {
PlayerEvents.readClaimData(event.getPlayer());
PlayerEvents.readClaimData(event.getEntity());
}
public static void disconnect(PlayerEvent.PlayerLoggedOutEvent event) {
PlayerEvents.onLogout(event.getPlayer());
PlayerEvents.onLogout(event.getEntity());
}
public static void serverTick(TickEvent.WorldTickEvent event) {
if (event.phase == TickEvent.Phase.START && event.world.getServer() != null && event.world.dimension() == Level.OVERWORLD)
LogoutTracker.getInstance(event.world.getServer()).tick();
public static void serverTick(TickEvent.LevelTickEvent event) {
if (event.phase == TickEvent.Phase.START && event.level.getServer() != null && event.level.dimension() == Level.OVERWORLD)
LogoutTracker.getInstance(event.level.getServer()).tick();
}
}

11
forge/src/main/java/io/github/flemmli97/flan/forge/forgeevent/WorldEventsForge.java
View File

@ -2,22 +2,21 @@ package io.github.flemmli97.flan.forge.forgeevent;
import io.github.flemmli97.flan.event.WorldEvents;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Mob;
import net.minecraftforge.event.entity.living.LivingSpawnEvent;
import net.minecraftforge.event.world.ExplosionEvent;
import net.minecraftforge.event.level.ExplosionEvent;
import net.minecraftforge.eventbus.api.Event;
public class WorldEventsForge {
public static void modifyExplosion(ExplosionEvent.Detonate event) {
if (event.getWorld() instanceof ServerLevel)
WorldEvents.modifyExplosion(event.getExplosion(), (ServerLevel) event.getWorld());
if (event.getLevel() instanceof ServerLevel)
WorldEvents.modifyExplosion(event.getExplosion(), (ServerLevel) event.getLevel());
}
public static void preventMobSpawn(LivingSpawnEvent.CheckSpawn event) {
if (!(event.getWorld() instanceof ServerLevel) || !(event.getEntityLiving() instanceof Mob))
if (!(event.getLevel() instanceof ServerLevel))
return;
if (WorldEvents.preventMobSpawn((ServerLevel) event.getWorld(), (Mob) event.getEntityLiving()))
if (WorldEvents.preventMobSpawn((ServerLevel) event.getLevel(), event.getEntity()))
event.setResult(Event.Result.DENY);
}
}

2
forge/src/main/java/io/github/flemmli97/flan/forge/platform/CrossPlatformStuffImpl.java
View File

@ -41,7 +41,7 @@ public class CrossPlatformStuffImpl implements CrossPlatformStuff {
@Override
public SimpleRegistryWrapper<EntityType<?>> registryEntities() {
return new ForgeRegistryWrapper<>(ForgeRegistries.ENTITIES);
return new ForgeRegistryWrapper<>(ForgeRegistries.ENTITY_TYPES);
}
@Override

6
forge/src/main/resources/META-INF/mods.toml
View File

@ -16,3 +16,9 @@ mandatory=true
versionRange="[1.19,)"
ordering="NONE"
side="BOTH"
[[dependencies.flan]]
modId="forge"
mandatory=true
versionRange="[41.1.0,)"
ordering="NONE"
side="BOTH"

6
gradle.properties
View File

@ -3,17 +3,17 @@ enabled_platforms=fabric,forge
minecraft_version=1.19
parchment_version=1.18.2:2022.06.26
# Forge Properties
forge_version=1.19-41.0.62
forge_version=1.19-41.1.0
# Fabric Properties
# check these on https://fabricmc.net/use
loader_version=0.14.8
# Mod Properties
mod_version=1.7.10
mod_version=1.7.11
maven_group=io.github.flemmli97
archives_base_name=flan
# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.57.0+1.19
fabric_version=0.58.0+1.19
fabric_permissions_api=0.1-SNAPSHOT
player_ability_lib=1.2.2
ftb_ranks=1900.1.9-build.42