Skip to content

Commit 402fcd0

Browse files
nullvednullved
committed
v0.16.4.0 - Range Upgrade Storage, Refactoring
- Refactored all storages into the storage and client.storage packages - Added a range upgrade storage, get it with PMWStorages#rangeUpgrades and PMWClientStorages#rangeUpgrades - Removed StormType, use PMWeather's StormType
1 parent 8239b98 commit 402fcd0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+321
-211
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ parchment_mappings_version=2024.11.17
1717
mod_id=pmweatherapi
1818
mod_name=PMWeatherAPI
1919
mod_license=GNU GPL 3.0
20-
mod_version=0.16.4.0-dev-1
20+
mod_version=0.16.4.0-dev-2
2121
mod_group_id=net.nullved
2222
mod_authors=nullved
2323
mod_description=An API for interfacing with ProtoManly's Weather Mod

‎src/main/java/net/nullved/pmweatherapi/PMWeatherAPI.java‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,23 @@
1414
import net.neoforged.neoforge.client.gui.ConfigurationScreen;
1515
import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
1616
import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
17-
import net.nullved.pmweatherapi.client.data.PMWClientStorages;
18-
import net.nullved.pmweatherapi.client.metar.MetarClientStorage;
19-
import net.nullved.pmweatherapi.client.radar.RadarClientStorage;
20-
import net.nullved.pmweatherapi.client.radar.WSRClientStorage;
21-
import net.nullved.pmweatherapi.client.render.IDOverlay;
22-
import net.nullved.pmweatherapi.client.render.radar.RadarOverlays;
17+
import net.nullved.pmweatherapi.client.storage.PMWClientStorages;
18+
import net.nullved.pmweatherapi.client.storage.metar.MetarClientStorage;
19+
import net.nullved.pmweatherapi.client.storage.radar.RadarClientStorage;
20+
import net.nullved.pmweatherapi.client.storage.radar.RangeUpgradeClientStorage;
21+
import net.nullved.pmweatherapi.client.storage.wsr.WSRClientStorage;
2322
import net.nullved.pmweatherapi.config.PMWClientConfig;
2423
import net.nullved.pmweatherapi.data.PMWStorages;
25-
import net.nullved.pmweatherapi.metar.MetarServerStorage;
26-
import net.nullved.pmweatherapi.metar.MetarStorage;
27-
import net.nullved.pmweatherapi.metar.MetarStorageData;
24+
import net.nullved.pmweatherapi.storage.metar.MetarServerStorage;
25+
import net.nullved.pmweatherapi.storage.metar.MetarStorage;
26+
import net.nullved.pmweatherapi.storage.metar.MetarStorageData;
2827
import net.nullved.pmweatherapi.network.PMWNetworking;
29-
import net.nullved.pmweatherapi.radar.storage.*;
3028
import net.nullved.pmweatherapi.storage.data.BlockPosData;
3129
import net.nullved.pmweatherapi.storage.data.StorageDataManager;
30+
import net.nullved.pmweatherapi.storage.radar.*;
31+
import net.nullved.pmweatherapi.storage.wsr.WSRServerStorage;
32+
import net.nullved.pmweatherapi.storage.wsr.WSRStorage;
33+
import net.nullved.pmweatherapi.storage.wsr.WSRStorageData;
3234
import org.slf4j.Logger;
3335

3436
import java.util.List;
@@ -67,6 +69,7 @@ private void commonSetup(FMLCommonSetupEvent event) {
6769
PMWStorages.registerStorage(RadarStorage.ID, RadarServerStorage.class, RadarServerStorage::new);
6870
PMWStorages.registerStorage(MetarStorage.ID, MetarServerStorage.class, MetarServerStorage::new);
6971
PMWStorages.registerStorage(WSRStorage.ID, WSRServerStorage.class, WSRServerStorage::new);
72+
PMWStorages.registerStorage(RangeUpgradeStorage.ID, RangeUpgradeServerStorage.class, RangeUpgradeServerStorage::new);
7073
}
7174

7275
private void registerPayloads(RegisterPayloadHandlersEvent event) {
@@ -80,6 +83,7 @@ private void clientSetup(FMLClientSetupEvent event) {
8083
PMWClientStorages.registerStorage(RadarStorage.ID, RadarClientStorage.class, RadarClientStorage::new);
8184
PMWClientStorages.registerStorage(MetarStorage.ID, MetarClientStorage.class, MetarClientStorage::new);
8285
PMWClientStorages.registerStorage(WSRStorage.ID, WSRClientStorage.class, WSRClientStorage::new);
86+
PMWClientStorages.registerStorage(RangeUpgradeStorage.ID, RangeUpgradeClientStorage.class, RangeUpgradeClientStorage::new);
8387
}
8488
public static ResourceLocation rl(String path) {
8589
return ResourceLocation.fromNamespaceAndPath(MODID, path);

‎src/main/java/net/nullved/pmweatherapi/client/event/PMWClientEvents.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import net.neoforged.fml.common.EventBusSubscriber;
88
import net.neoforged.neoforge.event.level.LevelEvent;
99
import net.nullved.pmweatherapi.PMWeatherAPI;
10-
import net.nullved.pmweatherapi.client.data.PMWClientStorages;
10+
import net.nullved.pmweatherapi.client.storage.PMWClientStorages;
1111

1212
@EventBusSubscriber(modid = PMWeatherAPI.MODID, value = Dist.CLIENT)
1313
public class PMWClientEvents {

‎src/main/java/net/nullved/pmweatherapi/client/render/debug/DebugMetarsOverlay.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package net.nullved.pmweatherapi.client.render.debug;
22

33
import net.nullved.pmweatherapi.PMWeatherAPI;
4-
import net.nullved.pmweatherapi.client.data.PMWClientStorages;
4+
import net.nullved.pmweatherapi.client.storage.PMWClientStorages;
55
import net.nullved.pmweatherapi.client.render.RadarRenderData;
66
import net.nullved.pmweatherapi.client.render.radar.IRadarOverlay;
77

‎src/main/java/net/nullved/pmweatherapi/client/render/debug/DebugWSRSOverlay.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package net.nullved.pmweatherapi.client.render.debug;
22

33
import net.nullved.pmweatherapi.PMWeatherAPI;
4-
import net.nullved.pmweatherapi.client.data.PMWClientStorages;
4+
import net.nullved.pmweatherapi.client.storage.PMWClientStorages;
55
import net.nullved.pmweatherapi.client.render.RadarRenderData;
66
import net.nullved.pmweatherapi.client.render.radar.IRadarOverlay;
7-
import net.nullved.pmweatherapi.radar.NearbyRadars;
87

98
public class DebugWSRSOverlay extends DebugOverlay {
109
public static final IRadarOverlay INSTANCE = new DebugWSRSOverlay();

‎src/main/java/net/nullved/pmweatherapi/client/storage/ClientStorageInstance.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
import net.minecraft.client.multiplayer.ClientLevel;
44
import net.minecraft.resources.ResourceLocation;
55
import net.nullved.pmweatherapi.PMWeatherAPI;
6-
import net.nullved.pmweatherapi.client.data.IClientStorage;
7-
import net.nullved.pmweatherapi.client.data.PMWClientStorages;
86
import net.nullved.pmweatherapi.storage.StorageInstance;
97
import net.nullved.pmweatherapi.storage.data.IStorageData;
10-
import net.nullved.pmweatherapi.storage.data.StorageData;
118

129
import java.util.Optional;
1310
import java.util.function.Function;

src/main/java/net/nullved/pmweatherapi/client/data/IClientStorage.java renamed to src/main/java/net/nullved/pmweatherapi/client/storage/IClientStorage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package net.nullved.pmweatherapi.client.data;
1+
package net.nullved.pmweatherapi.client.storage;
22

33
import net.minecraft.client.multiplayer.ClientLevel;
44
import net.minecraft.core.BlockPos;
55
import net.minecraft.nbt.*;
66
import net.nullved.pmweatherapi.PMWeatherAPI;
7-
import net.nullved.pmweatherapi.client.radar.RadarClientStorage;
7+
import net.nullved.pmweatherapi.client.storage.radar.RadarClientStorage;
88
import net.nullved.pmweatherapi.network.S2CStoragePacket;
99
import net.nullved.pmweatherapi.storage.IStorage;
1010
import net.nullved.pmweatherapi.storage.data.IStorageData;

src/main/java/net/nullved/pmweatherapi/client/data/PMWClientStorages.java renamed to src/main/java/net/nullved/pmweatherapi/client/storage/PMWClientStorages.java

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
package net.nullved.pmweatherapi.client.data;
1+
package net.nullved.pmweatherapi.client.storage;
22

33
import dev.protomanly.pmweather.block.entity.RadarBlockEntity;
44
import net.minecraft.client.Minecraft;
55
import net.minecraft.client.multiplayer.ClientLevel;
6-
import net.minecraft.core.BlockPos;
76
import net.minecraft.resources.ResourceLocation;
87
import net.neoforged.api.distmarker.Dist;
98
import net.neoforged.api.distmarker.OnlyIn;
109
import net.nullved.pmweatherapi.PMWeatherAPI;
11-
import net.nullved.pmweatherapi.client.metar.MetarClientStorage;
12-
import net.nullved.pmweatherapi.client.radar.RadarClientStorage;
13-
import net.nullved.pmweatherapi.client.radar.WSRClientStorage;
14-
import net.nullved.pmweatherapi.client.storage.ClientStorageInstance;
15-
import net.nullved.pmweatherapi.metar.MetarStorage;
16-
import net.nullved.pmweatherapi.metar.MetarStorageData;
10+
import net.nullved.pmweatherapi.client.storage.metar.MetarClientStorage;
11+
import net.nullved.pmweatherapi.client.storage.radar.RadarClientStorage;
12+
import net.nullved.pmweatherapi.client.storage.radar.RangeUpgradeClientStorage;
13+
import net.nullved.pmweatherapi.client.storage.wsr.WSRClientStorage;
14+
import net.nullved.pmweatherapi.storage.data.BlockPosData;
15+
import net.nullved.pmweatherapi.storage.metar.MetarStorage;
16+
import net.nullved.pmweatherapi.storage.metar.MetarStorageData;
1717
import net.nullved.pmweatherapi.radar.RadarMode;
18-
import net.nullved.pmweatherapi.radar.storage.RadarStorage;
19-
import net.nullved.pmweatherapi.radar.storage.WSRStorage;
20-
import net.nullved.pmweatherapi.radar.storage.WSRStorageData;
18+
import net.nullved.pmweatherapi.storage.radar.RadarStorage;
19+
import net.nullved.pmweatherapi.storage.radar.RangeUpgradeStorage;
20+
import net.nullved.pmweatherapi.storage.wsr.WSRStorage;
21+
import net.nullved.pmweatherapi.storage.wsr.WSRStorageData;
2122
import net.nullved.pmweatherapi.storage.data.IStorageData;
22-
import net.nullved.pmweatherapi.storage.data.StorageData;
23-
import net.nullved.pmweatherapi.radar.storage.RadarStorageData;
23+
import net.nullved.pmweatherapi.storage.radar.RadarStorageData;
2424

2525
import java.awt.*;
2626
import java.util.Collection;
@@ -72,6 +72,15 @@ public static ClientStorageInstance<WSRStorageData, WSRClientStorage> wsrs() {
7272
return get(WSRStorage.ID, WSRClientStorage.class).orElseThrow();
7373
}
7474

75+
/**
76+
* Gets the {@link ClientStorageInstance} of the {@link RangeUpgradeClientStorage}
77+
* @return The {@link ClientStorageInstance}
78+
* @since 0.16.4.0
79+
*/
80+
public static ClientStorageInstance<BlockPosData, RangeUpgradeClientStorage> rangeUpgrades() {
81+
return get(RangeUpgradeStorage.ID, RangeUpgradeClientStorage.class).orElseThrow();
82+
}
83+
7584
/**
7685
* Get a {@link ClientStorageInstance} for a given {@link ResourceLocation} ID
7786
* @param location The ID of the storage

src/main/java/net/nullved/pmweatherapi/client/metar/MetarClientStorage.java renamed to src/main/java/net/nullved/pmweatherapi/client/storage/metar/MetarClientStorage.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
package net.nullved.pmweatherapi.client.metar;
1+
package net.nullved.pmweatherapi.client.storage.metar;
22

33
import dev.protomanly.pmweather.block.MetarBlock;
4-
import dev.protomanly.pmweather.block.RadarBlock;
54
import net.minecraft.client.Minecraft;
65
import net.minecraft.client.multiplayer.ClientLevel;
7-
import net.nullved.pmweatherapi.client.data.IClientStorage;
8-
import net.nullved.pmweatherapi.client.data.PMWClientStorages;
9-
import net.nullved.pmweatherapi.metar.MetarStorage;
10-
import net.nullved.pmweatherapi.metar.MetarStorageData;
11-
import net.nullved.pmweatherapi.radar.storage.RadarStorage;
12-
import net.nullved.pmweatherapi.radar.storage.RadarStorageData;
6+
import net.nullved.pmweatherapi.client.storage.IClientStorage;
7+
import net.nullved.pmweatherapi.client.storage.PMWClientStorages;
8+
import net.nullved.pmweatherapi.storage.metar.MetarStorage;
9+
import net.nullved.pmweatherapi.storage.metar.MetarStorageData;
1310

1411
/**
1512
* A {@link IClientStorage} implementation for {@link MetarBlock}s

src/main/java/net/nullved/pmweatherapi/client/radar/RadarClientStorage.java renamed to src/main/java/net/nullved/pmweatherapi/client/storage/radar/RadarClientStorage.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package net.nullved.pmweatherapi.client.radar;
1+
package net.nullved.pmweatherapi.client.storage.radar;
22

33
import dev.protomanly.pmweather.block.RadarBlock;
44
import net.minecraft.client.Minecraft;
55
import net.minecraft.client.multiplayer.ClientLevel;
6-
import net.nullved.pmweatherapi.client.data.IClientStorage;
7-
import net.nullved.pmweatherapi.client.data.PMWClientStorages;
8-
import net.nullved.pmweatherapi.radar.storage.RadarStorage;
9-
import net.nullved.pmweatherapi.radar.storage.RadarStorageData;
6+
import net.nullved.pmweatherapi.client.storage.IClientStorage;
7+
import net.nullved.pmweatherapi.client.storage.PMWClientStorages;
8+
import net.nullved.pmweatherapi.storage.radar.RadarStorage;
9+
import net.nullved.pmweatherapi.storage.radar.RadarStorageData;
1010

1111
/**
1212
* A {@link IClientStorage} implementation for {@link RadarBlock}s

0 commit comments

Comments
 (0)