Skip to content

Commit 8953103

Browse files
LounodeLounode
committed
spotless
1 parent e802fb5 commit 8953103

34 files changed

Lines changed: 749 additions & 733 deletions

‎common/src/main/java/io/github/lounode/eventwrapper/event/level/BlockEventWrapper.java‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import net.minecraft.world.entity.player.Player;
99
import net.minecraft.world.item.ItemStack;
1010
import net.minecraft.world.item.context.UseOnContext;
11+
import net.minecraft.world.item.enchantment.EnchantmentHelper;
1112
import net.minecraft.world.item.enchantment.Enchantments;
1213
import net.minecraft.world.level.Level;
1314
import net.minecraft.world.level.LevelAccessor;
@@ -92,9 +93,10 @@ public BreakEvent(Level level, BlockPos pos, BlockState state, Player player) {
9293
{
9394
this.exp = 0;
9495
} else {
95-
int fortuneLevel = player.getMainHandItem().getEnchantmentLevel(Enchantments.BLOCK_FORTUNE);
96-
int silkTouchLevel = player.getMainHandItem().getEnchantmentLevel(Enchantments.SILK_TOUCH);
97-
this.exp = state.getExpDrop(level, level.random, pos, fortuneLevel, silkTouchLevel);
96+
ItemStack stack = player.getMainHandItem();
97+
int fortuneLevel = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.BLOCK_FORTUNE, stack);
98+
int silkTouchLevel = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, stack);
99+
//this.exp = state.getBlock().getExpDrop(level, level.random, pos, fortuneLevel, silkTouchLevel);
98100
}
99101
}
100102

@@ -141,10 +143,12 @@ public EntityPlaceEvent(@NotNull BlockSnapshot blockSnapshot, @NotNull BlockStat
141143
this.blockSnapshot = blockSnapshot;
142144
this.placedBlock = !(entity instanceof Player) ? blockSnapshot.getReplacedBlock() : blockSnapshot.getCurrentBlock();
143145
this.placedAgainst = placedAgainst;
144-
146+
/*
145147
if (DEBUG) {
146148
System.out.printf("Created EntityPlaceEvent - [PlacedBlock: %s ][PlacedAgainst: %s ][Entity: %s ]\n", getPlacedBlock(), placedAgainst, entity);
147149
}
150+
151+
*/
148152
}
149153

150154
@Nullable
@@ -180,9 +184,12 @@ public static class EntityMultiPlaceEvent extends BlockEventWrapper.EntityPlaceE
180184
public EntityMultiPlaceEvent(@NotNull List<BlockSnapshot> blockSnapshots, @NotNull BlockState placedAgainst, @Nullable Entity entity) {
181185
super(blockSnapshots.get(0), placedAgainst, entity);
182186
this.blockSnapshots = ImmutableList.copyOf(blockSnapshots);
187+
/*
183188
if (DEBUG) {
184189
System.out.printf("Created EntityMultiPlaceEvent - [PlacedAgainst: %s ][Entity: %s ]\n", placedAgainst, entity);
185190
}
191+
192+
*/
186193
}
187194

188195
/**

‎common/src/main/java/io/github/lounode/eventwrapper/event/server/ServerLifecycleEventWrapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import net.minecraft.server.MinecraftServer;
44
import net.minecraftforge.event.server.ServerLifecycleEvent;
5+
import net.minecraftforge.eventbus.api.Event;
56

67

78
import io.github.lounode.eventwrapper.eventbus.api.EventWrapper;
89
import io.github.lounode.xplatform.platform.Platform;
910
import io.github.lounode.xplatform.platform.support.SupportPlatform;
10-
import net.minecraftforge.eventbus.api.Event;
1111

1212
public class ServerLifecycleEventWrapper extends EventWrapper {
1313

‎common/src/main/java/io/github/lounode/eventwrapper/event/server/ServerStartedEventWrapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import net.minecraft.server.MinecraftServer;
44
import net.minecraftforge.event.server.ServerStartedEvent;
55
import net.minecraftforge.event.server.ServerStartingEvent;
6+
import net.minecraftforge.eventbus.api.Event;
67

78

89
import io.github.lounode.xplatform.platform.Platform;
910
import io.github.lounode.xplatform.platform.support.SupportPlatform;
10-
import net.minecraftforge.eventbus.api.Event;
1111

1212
/**
1313
* Called after {@link ServerStartingEvent} when the server is available and ready to play.

‎common/src/main/java/io/github/lounode/eventwrapper/event/server/ServerStartingEventWrapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import net.minecraftforge.event.server.ServerAboutToStartEvent;
55
import net.minecraftforge.event.server.ServerStartedEvent;
66
import net.minecraftforge.event.server.ServerStartingEvent;
7+
import net.minecraftforge.eventbus.api.Event;
78

89

910
import io.github.lounode.xplatform.platform.Platform;
1011
import io.github.lounode.xplatform.platform.support.SupportPlatform;
11-
import net.minecraftforge.eventbus.api.Event;
1212

1313
/**
1414
* Called after {@link ServerAboutToStartEvent} and before {@link ServerStartedEvent}.

‎common/src/main/java/io/github/lounode/eventwrapper/event/server/ServerStoppedEventWrapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import net.minecraft.server.MinecraftServer;
44
import net.minecraftforge.event.server.ServerStoppedEvent;
55
import net.minecraftforge.event.server.ServerStoppingEvent;
6+
import net.minecraftforge.eventbus.api.Event;
67

78

89
import io.github.lounode.xplatform.platform.Platform;
910
import io.github.lounode.xplatform.platform.support.SupportPlatform;
10-
import net.minecraftforge.eventbus.api.Event;
1111

1212
/**
1313
* Called after {@link ServerStoppingEvent} when the server has completely shut down.

‎common/src/main/java/io/github/lounode/eventwrapper/event/server/ServerStoppingEventWrapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import net.minecraft.server.MinecraftServer;
44
import net.minecraftforge.event.server.ServerStoppedEvent;
55
import net.minecraftforge.event.server.ServerStoppingEvent;
6+
import net.minecraftforge.eventbus.api.Event;
67

78

89
import io.github.lounode.xplatform.platform.Platform;
910
import io.github.lounode.xplatform.platform.support.CrossPlatform;
1011
import io.github.lounode.xplatform.platform.support.SupportPlatform;
11-
import net.minecraftforge.eventbus.api.Event;
1212

1313
/**
1414
* Called when the server begins an orderly shutdown, before {@link ServerStoppedEvent}.

‎common/src/main/java/io/github/lounode/eventwrapper/eventbus/api/IPlatformEventHelper.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.github.lounode.eventwrapper.eventbus.api;
22

3-
import io.github.lounode.eventwrapper.event.ServiceUtil;
43
import net.minecraft.world.entity.player.Player;
54
import net.minecraft.world.level.block.state.BlockState;
65

@@ -10,6 +9,8 @@
109
import java.util.Arrays;
1110
import java.util.List;
1211

12+
import io.github.lounode.eventwrapper.event.ServiceUtil;
13+
1314
public interface IPlatformEventHelper {
1415
String forgePackageNamePrefix = "net.minecraftforge";
1516
IPlatformEventHelper INSTANCE = ServiceUtil.findService(IPlatformEventHelper.class, null);

‎common/src/main/java/io/github/lounode/eventwrapper/utils/BlockSnapshot.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ private BlockSnapshot(ResourceKey<Level> dim, LevelAccessor level, BlockPos pos,
4646

4747
this.level = new WeakReference<>(level);
4848

49-
if (DEBUG)
50-
System.out.println("Created " + this.toString());
5149
}
5250

5351
public static BlockSnapshot create(ResourceKey<Level> dim, LevelAccessor world, BlockPos pos) {
@@ -73,7 +71,7 @@ public LevelAccessor getLevel() {
7371
LevelAccessor world = this.level != null ? this.level.get() : null;
7472
if (world == null) {
7573
world = ServerLifecycleHooks.getCurrentServer().getLevel(this.dim);
76-
this.level = new WeakReference<LevelAccessor>(world);
74+
this.level = new WeakReference<>(world);
7775
}
7876
return world;
7977
}
@@ -106,15 +104,17 @@ public boolean restoreToLocation(LevelAccessor world, BlockPos pos, boolean forc
106104
int flags = notifyNeighbors ? Block.UPDATE_ALL : Block.UPDATE_CLIENTS;
107105

108106
if (current != replaced) {
109-
if (force)
107+
if (force) {
110108
world.setBlock(pos, replaced, flags);
111-
else
109+
} else {
112110
return false;
111+
}
113112
}
114113

115114
world.setBlock(pos, replaced, flags);
116-
if (world instanceof Level)
115+
if (world instanceof Level) {
117116
((Level) world).sendBlockUpdated(pos, current, replaced, flags);
117+
}
118118

119119
BlockEntity te = null;
120120
if (getTag() != null) {
@@ -125,17 +125,17 @@ public boolean restoreToLocation(LevelAccessor world, BlockPos pos, boolean forc
125125
}
126126
}
127127

128-
if (DEBUG)
129-
System.out.println("Restored " + this.toString());
130128
return true;
131129
}
132130

133131
@Override
134132
public boolean equals(Object obj) {
135-
if (obj == this)
133+
if (obj == this) {
136134
return true;
137-
if (obj == null || getClass() != obj.getClass())
135+
}
136+
if (obj == null || getClass() != obj.getClass()) {
138137
return false;
138+
}
139139

140140
final BlockSnapshot other = (BlockSnapshot) obj;
141141
return this.dim.equals(other.dim) &&

‎forge/src/main/java/io/github/lounode/eventwrapper/forge/ForgeEventHelper.java‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
package io.github.lounode.eventwrapper.forge;
22

3-
import io.github.lounode.eventwrapper.eventbus.api.EventConverter;
4-
import io.github.lounode.eventwrapper.eventbus.api.EventWrapper;
5-
import io.github.lounode.eventwrapper.eventbus.api.IPlatformEventHelper;
6-
import io.github.lounode.eventwrapper.eventbus.api.SubscribeEventWrapper;
7-
import io.github.lounode.eventwrapper.forge.event.ForgeEventMappings;
83
import net.minecraft.world.entity.player.Player;
94
import net.minecraft.world.level.block.state.BlockState;
105
import net.minecraftforge.api.distmarker.Dist;
@@ -14,6 +9,7 @@
149
import net.minecraftforge.eventbus.api.Event;
1510
import net.minecraftforge.eventbus.api.EventPriority;
1611
import net.minecraftforge.fml.loading.FMLEnvironment;
12+
1713
import org.apache.logging.log4j.LogManager;
1814
import org.apache.logging.log4j.Logger;
1915

@@ -23,6 +19,12 @@
2319
import java.util.WeakHashMap;
2420
import java.util.stream.Stream;
2521

22+
import io.github.lounode.eventwrapper.eventbus.api.EventConverter;
23+
import io.github.lounode.eventwrapper.eventbus.api.EventWrapper;
24+
import io.github.lounode.eventwrapper.eventbus.api.IPlatformEventHelper;
25+
import io.github.lounode.eventwrapper.eventbus.api.SubscribeEventWrapper;
26+
import io.github.lounode.eventwrapper.forge.event.ForgeEventMappings;
27+
2628
public class ForgeEventHelper implements IPlatformEventHelper {
2729

2830
private static final Logger LOGGER = LogManager.getLogger();
@@ -34,7 +36,7 @@ public boolean isForge() {
3436
}
3537

3638
@Override
37-
@SuppressWarnings("unchecked")
39+
@SuppressWarnings({ "unchecked", "rawtypes" })
3840
public <T extends EventWrapper> T post(T event) {
3941
EventConverter converter = ForgeEventMappings.getConverter(event.getClass());
4042

@@ -46,23 +48,23 @@ public <T extends EventWrapper> T post(T event) {
4648
Event forgeEvent = (Event) converter.toEvent(event);
4749

4850
/*
49-
51+
5052
if (!(forgeEvent instanceof ForgeEventExtension extension)) {
5153
LOGGER.error("Event extension does not existed: {}", forgeEvent.getClass());
5254
return event;
5355
}
54-
56+
5557
extension.EventWrapper_setEventWrapper(event);
56-
57-
*/
58+
59+
*/
5860
track(forgeEvent, event);
5961

6062
MinecraftForge.EVENT_BUS.post(forgeEvent);
6163

62-
/*
64+
/*
6365
Event forgeEvent = (Event) event.toForgeEvent();
6466
track(forgeEvent, event);
65-
67+
6668
//Because Wrapper -> ForgeEvent -> ForgeBus
6769
//The reference will lose during translation
6870
//So we use a WeakHashMap to keep additional reference
@@ -71,8 +73,8 @@ public <T extends EventWrapper> T post(T event) {
7173
MinecraftForge.EVENT_BUS.post(forgeEvent);
7274
//Anti-GC
7375
holder[0] = null;
74-
75-
*/
76+
77+
*/
7678

7779
return event;
7880
}
@@ -101,6 +103,7 @@ static Class<? extends Event> getForgeEventClass(Class<? extends EventWrapper> w
101103
}
102104
}
103105

106+
@SuppressWarnings({ "rawtypes", "unchecked" })
104107
private void registerListener(Object target, Method method) {
105108
Class<?>[] params = method.getParameterTypes();
106109
if (params.length != 1) {
@@ -120,7 +123,6 @@ private void registerListener(Object target, Method method) {
120123
return;
121124
}
122125

123-
124126
Class<? extends Event> forgeEventClass = ForgeEventMappings.getForgeEventClass(wrapperClass);
125127

126128
if (forgeEventClass == null) {
@@ -140,49 +142,48 @@ private void registerListener(Object target, Method method) {
140142
LOGGER.error("Event extension does not existed: {}", event.getClass());
141143
return;
142144
}
143-
144-
*/
145+
146+
*/
145147

146148
wrapper = converter.toWrapper(event);
147149

148150
/*
149-
151+
150152
if (extension.EventWrapper_getEventWrapper() != null) {
151153
extension.EventWrapper_setEventWrapper(wrapper);
152154
}
153-
154-
*/
155+
156+
*/
155157
if (FORGE_EVENT_TRACKER_MAP.containsKey(event)) {
156158
wrapper = FORGE_EVENT_TRACKER_MAP.get(event);
157159
IPlatformEventHelper.syncEventData(event, wrapper);
158160
}
159161

160-
161162
method.setAccessible(true);
162163
method.invoke(target, wrapper);
163164

164165
IPlatformEventHelper.syncEventData(wrapper, event);
165166
/*
166-
167+
167168
Constructor<?> ctor = wrapperClass.getConstructor(forgeEventClass);
168-
169+
169170
EventWrapper wrapperEvent;
170171
wrapperEvent = getWrapper(event);
171-
172+
172173
if (wrapperEvent == null) {
173174
wrapperEvent = (EventWrapper) ctor.newInstance(event);
174175
}
175-
176+
176177
EventConverter converter = ForgeEventMappings.getConverter(wrapperEvent.getClass());
177178
if (converter != null) {
178179
wrapperEvent = converter.toWrapper(event);
179180
}
180-
181+
181182
method.setAccessible(true);
182183
method.invoke(target, wrapperEvent);
183184
IPlatformEventHelper.syncEventData(wrapperEvent, event);
184-
185-
*/
185+
186+
*/
186187
} catch (Exception e) {
187188
throw new RuntimeException("Event call Error!", e);
188189
}

‎forge/src/main/java/io/github/lounode/eventwrapper/forge/event/ForgeEventExtension.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package io.github.lounode.eventwrapper.forge.event;
22

3-
import io.github.lounode.eventwrapper.eventbus.api.EventWrapper;
43
import org.jetbrains.annotations.Nullable;
54

5+
6+
import io.github.lounode.eventwrapper.eventbus.api.EventWrapper;
7+
68
public interface ForgeEventExtension {
7-
void EventWrapper_setEventWrapper(EventWrapper wrapper);
9+
void EventWrapper_setEventWrapper(EventWrapper wrapper);
810

9-
@Nullable
10-
EventWrapper EventWrapper_getEventWrapper();
11+
@Nullable
12+
EventWrapper EventWrapper_getEventWrapper();
1113
}

0 commit comments

Comments
 (0)