The great culling: Part One

VazkiiMods · Dec 1, 2021 · 755f680 · 755f680
1 parent f35d493
commit 755f680
Show file tree

Hide file tree

Showing 2,081 changed files with 237 additions and 32,091 deletions.
diff --git a/src/main/java/vazkii/quark/addons/oddities/tile/MatrixEnchantingTableTileEntity.java b/src/main/java/vazkii/quark/addons/oddities/tile/MatrixEnchantingTableTileEntity.java
@@ -272,6 +272,7 @@ private float getEnchantPowerAt(World world, BlockPos pos) {
 				if(ord != null) {
 					List<Enchantment> influencedEnchants = MatrixEnchantingModule.candleInfluences.get(ord);
 					if(influencedEnchants != null) {
+						// TODO 1.18: hardcode vanilla candles 
 					    if(influencer instanceof IModifiableEnchantmentInfluencer) {
 					        IModifiableEnchantmentInfluencer modifiableInfluencer = (IModifiableEnchantmentInfluencer) influencer;
                             influencedEnchants = modifiableInfluencer.getModifiedEnchantments(world, pos, state, getStackInSlot(0), new ArrayList<>(influencedEnchants));

diff --git a/src/main/java/vazkii/quark/base/network/QuarkNetwork.java b/src/main/java/vazkii/quark/base/network/QuarkNetwork.java
@@ -23,7 +23,6 @@
 import vazkii.quark.base.network.message.SortInventoryMessage;
 import vazkii.quark.base.network.message.SpamlessChatMessage;
 import vazkii.quark.base.network.message.SwapArmorMessage;
-import vazkii.quark.base.network.message.SyncChainMessage;
 import vazkii.quark.base.network.message.UpdateAfkMessage;
 import vazkii.quark.base.network.message.WithdrawSeedsMessage;
 
@@ -54,7 +53,6 @@ public static void setup() {
 
 		network.register(DoEmoteMessage.class, NetworkDirection.PLAY_TO_CLIENT);
 		network.register(SpamlessChatMessage.class, NetworkDirection.PLAY_TO_CLIENT);
-		network.register(SyncChainMessage.class, NetworkDirection.PLAY_TO_CLIENT);
 		network.register(EditSignMessage.class, NetworkDirection.PLAY_TO_CLIENT);
 	}
 

diff --git a/src/main/java/vazkii/quark/base/network/message/SyncChainMessage.java b/src/main/java/vazkii/quark/base/network/message/SyncChainMessage.java
diff --git a/src/main/java/vazkii/quark/base/world/WorldGenWeights.java b/src/main/java/vazkii/quark/base/world/WorldGenWeights.java
@@ -5,15 +5,10 @@ public class WorldGenWeights {
 	// UNDERGROUND_ORES
 	public static final int CLAY = 0;
 	public static final int NEW_STONES = 1;
-	public static final int BIOTITE = 2;
 
 	// UNDERGROUND_DECORATION
 	public static final int BIG_STONE_CLUSTERS = 0;
 	public static final int UNDERGROUND_BIOMES = 1;
-	public static final int DEEPSLATE_SHEETS = 2;
-	public static final int SPELEOTHEMS = 3;
-	public static final int CAVE_ROOTS = 4;
-	public static final int UNDERGROUND_OPEN_ROOMS = 5;
 	public static final int MONSTER_BOXES = 6;
 
 	// UNDERGROUND_DECORATION (nether)

diff --git a/src/main/java/vazkii/quark/content/automation/ai/FormShulkerGoal.java b/src/main/java/vazkii/quark/content/automation/ai/FormShulkerGoal.java
diff --git a/src/main/java/vazkii/quark/content/automation/base/ChainHandler.java b/src/main/java/vazkii/quark/content/automation/base/ChainHandler.java