Skip to content

Commit 2c21279

Browse files
committed
cleanup: removed LC Compat code :(
1 parent 3ca16d2 commit 2c21279

File tree

13 files changed

+11
-228
lines changed

13 files changed

+11
-228
lines changed

build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,6 @@ repositories {
123123
maven { url 'https://maven.fabricmc.net' }
124124
maven { url = "https://maven.blamejared.com" }
125125
maven { url = "https://jitpack.io" }
126-
maven {
127-
name "Modding Legacy Maven"
128-
url "https://maven.moddinglegacy.com/maven"
129-
}
130126
maven {
131127
url "https://cursemaven.com"
132128
content {

src/main/java/io/github/razordevs/deep_aether/DeepAether.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,10 @@ public class DeepAether {
103103

104104
public static final String MODID = "deep_aether";
105105
public static final String MOD_VERSION = "1.1.4";
106+
107+
// We lost hope on LC's side. Code removed and will be reintroduced in future versions if needed.
106108
public static final String LOST_AETHER_CONTENT = "lost_aether_content";
109+
107110
public static final String AETHER_GENESIS = "aether_genesis";
108111
public static final String AETHER_REDUX = "aether_redux";
109112
public static final String ANCIENT_AETHER = "ancient_aether";
@@ -231,9 +234,6 @@ private void registerFlawlessBossDrops() {
231234
this.getFlawlessBossDrop(AetherEntityTypes.VALKYRIE_QUEEN.get(), DeepAetherConfig.COMMON.valkyrie_queen_flawless_boss_drop.get(), DAItems.MEDAL_OF_HONOR.get());
232235
this.getFlawlessBossDrop(AetherEntityTypes.SUN_SPIRIT.get(), DeepAetherConfig.COMMON.sun_spirit_flawless_boss_drop.get(), DAItems.SUN_CORE.get());
233236
this.getFlawlessBossDrop(DAEntities.EOTS_CONTROLLER.get(), DeepAetherConfig.COMMON.eots_flawless_boss_drop.get(), DAItems.FLOATY_SCARF.get());
234-
235-
//if(ModList.get().isLoaded(DeepAether.LOST_AETHER_CONTENT)){}
236-
//this.getFlawlessBossDrop(LCEntityTypes.AERWHALE_KING, DeepAetherConfig.COMMON.aerwhale_king_flawless_boss_drop.get(), DAItems.AERWHALE_SADDLE.get());
237237
}
238238

239239
private void registerFluidInteractions(){
@@ -301,9 +301,8 @@ public void addAetherAdditionalResourcesPack(AddPackFindersEvent event) {
301301
else if (ModList.get().isLoaded(AETHER_REDUX))
302302
setupCompatPack("overrides/golden_swet_ball/DAGoldenSwetBallAetherReduxFixData", "Deep Aether Golden Swet Ball Aether Redux Fix", event);
303303

304-
if (ModList.get().isLoaded(LOST_AETHER_CONTENT))
305-
setupCompatPack("compat_recipes/aether_lost_content_compat", "Lost Aether Content Compat", event);
306-
else setupCompatPack("compat_recipes/aether_lost_content_not_compat", "Deep Aether Aerwhale Saddle Recipe", event);
304+
305+
setupCompatPack("compat_recipes/aether_lost_content_not_compat", "Deep Aether Aerwhale Saddle Recipe", event);
307306

308307
if (ModList.get().isLoaded(AETHER_REDUX))
309308
setupCompatPack("compat_recipes/aether_redux_compat", "Aether Redux Compat", event);

src/main/java/io/github/razordevs/deep_aether/client/model/AerwhaleModelOverrideOverrideLCCompat.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/main/java/io/github/razordevs/deep_aether/datagen/tags/DAItemTagData.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -409,10 +409,6 @@ protected void addTags(HolderLookup.Provider provider) {
409409
tag(AetherTags.Items.ACCESSORIES_MISCELLANEOUS).add(
410410
DAItems.SLIDER_EYE.get()
411411
);
412-
/*tag(TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(DeepAether.LOST_AETHER_CONTENT, "aether_shields"))).add(
413-
DAItems.SKYJADE_SHIELD.get(),
414-
DAItems.STRATUS_SHIELD.get()
415-
);*/
416412

417413
// Storm Bow
418414
tag(Tags.Items.TOOLS_BOW).add(

src/main/java/io/github/razordevs/deep_aether/event/DAClientModBusEvents.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,6 @@
6464
@EventBusSubscriber(modid = DeepAether.MODID, value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD)
6565
public class DAClientModBusEvents {
6666

67-
/**
68-
* See {@link com.legacy.lost_aether.client.LCEntityRendering}
69-
*/
70-
//TODO: UPDATE WHEN LOST AETHER CONTENT HAS PORTED TO 1.20.4 (unlikely)
71-
/*
72-
@SubscribeEvent(priority = EventPriority.HIGHEST) //We want to ensure our event is loaded before LC's event.
73-
public static void initPostLayers(final EntityRenderersEvent.RegisterLayerDefinitions event)
74-
{
75-
if(ModList.get().isLoaded(DeepAether.LOST_AETHER_CONTENT))
76-
event.registerLayerDefinition(AetherModelLayers.AERWHALE, AerwhaleModelOverrideOverrideLCCompat::createOverrideLayerButWithChest);
77-
}
78-
*/
79-
8067
@SubscribeEvent
8168
public static void clientSetup(FMLClientSetupEvent event) {
8269
registerAccessoriesRenderers();
@@ -96,10 +83,6 @@ public static void clientSetup(FMLClientSetupEvent event) {
9683
Sheets.addWoodType(DAWoodTypes.CONBERRY);
9784
Sheets.addWoodType(DAWoodTypes.SUNROOT);
9885

99-
/*if (ModList.get().isLoaded(DeepAether.LOST_AETHER_CONTENT)) {
100-
AddonItemModelPredicates.init();
101-
}*/
102-
10386
registerItemModelPredicates();
10487
Moa.registerJumpOverlayTextureOverride(ResourceLocation.fromNamespaceAndPath(DeepAether.MODID, "effect_extra_jumps"),
10588
ResourceLocation.fromNamespaceAndPath(DeepAether.MODID, "hud/effect_feather"));

src/main/java/io/github/razordevs/deep_aether/event/DAGeneralEvents.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -128,24 +128,6 @@ public static void onLivingEntityDeath(LivingDeathEvent event) {
128128
}
129129
}
130130
}
131-
/*
132-
@SubscribeEvent
133-
public static void onShieldBlock(ShieldBlockEvent event) {
134-
var blocker = event.getEntity();
135-
DamageSource source = event.getDamageSource();
136-
if (ModList.get().isLoaded(DeepAether.LOST_AETHER_CONTENT)) {
137-
if (blocker.getUseItem().is(TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(DeepAether.LOST_AETHER_CONTENT, "aether_shields")))) {
138-
blocker.level().playSound(null, blocker.blockPosition(), SoundEvents.ZOMBIE_ATTACK_IRON_DOOR, blocker.getSoundSource(), 0.4F, 0.8F + blocker.level().random.nextFloat() * 0.4F);
139-
140-
if (blocker.getUseItem().getItem() == DAItems.STRATUS_SHIELD.get() && source.getDirectEntity() instanceof LivingEntity attacker) {
141-
attacker.knockback(1.5F, blocker.getX() - attacker.getX(), blocker.getZ() - attacker.getZ());
142-
attacker.setPos(attacker.getX(), attacker.getY() + 1D, attacker.getZ());
143-
attacker.hasImpulse = true;
144-
}
145-
}
146-
}
147-
}
148-
*/
149131

150132

151133
@SubscribeEvent

src/main/java/io/github/razordevs/deep_aether/init/DAItems.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,8 @@ public class DAItems {
244244
public static final DeferredItem<Item> CHAOS_EMERALD = ITEMS.register("chaos_emerald", () -> new ChaosEmerald(new Item.Properties()));
245245

246246
public static final DeferredItem<Item> GLOWING_SPORES = ITEMS.register("glowing_spores", () -> new GlowingSporesItem(DABlocks.GLOWING_SPORES.get(), new Item.Properties()));
247+
248+
247249
//ADDONS
248250

249251
//PROTECT YOUR MOA
@@ -257,11 +259,8 @@ public class DAItems {
257259
SmithingTemplateItem.createNetheriteUpgradeIconList(), SmithingTemplateItem.createNetheriteUpgradeMaterialList())
258260
);
259261

260-
//LOST CONTENT
261-
/*
262-
public static final DeferredItem<Item> SKYJADE_SHIELD = registerLCItem("skyjade_shield", () -> new SkyjadeShieldItem(new Item.Properties().durability(672)));
263-
public static final DeferredItem<Item> STRATUS_SHIELD = registerLCItem("stratus_shield", () -> new LCDAShieldItem(new Item.Properties().durability(1344)));
264-
*/
262+
//GENESIS
263+
265264

266265
//Deep Aether 1.2/Experimental
267266
public static final DeferredItem<Item> SUN_CLOCK = ITEMS.register("sun_clock", ()-> new SunClock(new Item.Properties()));
@@ -296,14 +295,6 @@ public static void setupBucketReplacements() {
296295
SkyrootBucketItem.REPLACEMENTS.put(DAItems.PLACEABLE_POISON_BUCKET, AetherItems.SKYROOT_POISON_BUCKET);
297296
}
298297

299-
private static DeferredItem<Item> registerLCItem(String name, Supplier<Item> item) {
300-
if(ModList.get().isLoaded(DeepAether.LOST_AETHER_CONTENT)) {
301-
DeepAether.LOGGER.info("Deep Aether: Registering Aether Lost Content compat items");
302-
return ITEMS.register(name, item);
303-
}
304-
return ITEMS.register(name, ()-> new Item(new Item.Properties()));
305-
}
306-
307298
@SuppressWarnings({"unchecked", "SameParameterValue"})
308299
private static DeferredItem<?> registerPYMItem(String name, Supplier<?> item) {
309300
if(ModList.get().isLoaded(DeepAether.PROTECT_YOUR_MOA)) {

src/main/java/io/github/razordevs/deep_aether/init/DATabs.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -363,10 +363,6 @@ public static void buildCreativeModeTabs(BuildCreativeModeTabContentsEvent event
363363
}, event);
364364

365365

366-
//if (ModList.get().isLoaded(DeepAether.LOST_AETHER_CONTENT)) {
367-
//addToTab(DAItems.SKYJADE_TOOLS_HOE.get(), DAItems.SKYJADE_SHIELD.get(), event);
368-
//}
369-
370366
addToTab(AetherItems.GRAVITITE_HOE.get(), new Item[]{
371367
DAItems.STRATUS_SWORD.get(),
372368
DAItems.STRATUS_SHOVEL.get(),
@@ -377,10 +373,6 @@ public static void buildCreativeModeTabs(BuildCreativeModeTabContentsEvent event
377373

378374
addToTab(AetherItems.BRONZE_DUNGEON_KEY.get(), DAItems.BRASS_DUNGEON_KEY.get(), event);
379375

380-
//if (ModList.get().isLoaded(DeepAether.LOST_AETHER_CONTENT)) {
381-
//addToTab(DAItems.STRATUS_HOE.get(), DAItems.STRATUS_SHIELD.get(), event);
382-
//}
383-
384376
addToTab(AetherItems.SKYROOT_POWDER_SNOW_BUCKET.get(), DAItems.SKYROOT_VIRULENT_QUICKSAND_BUCKET.get(), event);
385377

386378
addToTab(AetherItems.SKYROOT_AXOLOTL_BUCKET.get(), DAItems.SKYROOT_AERGLOW_FISH_BUCKET.get(), event);

src/main/java/io/github/razordevs/deep_aether/item/compat/lost_content/AddonItemModelPredicates.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/main/java/io/github/razordevs/deep_aether/item/compat/lost_content/LCDAShieldItem.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)