mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 11:19:19 +00:00
Gaia fixes and anticheese stuff (#2853)
* No sleeping through the fight! * Far stricter arena check * Some cleanups * Change the way GG teleportation works + happier to break blocks * Simplify teleportation logic. * Basically just picks a point somewhere in the arena and goes there. * Doesn't take collision boxes etc into consideration. * This fixes the "double carpet" exploit. * GG is now super happy to break blocks. * Will break blocks in the path of a teleport. * Will break blocks around it every tick. * A new API method is added to add immune blocks (such as the pylons). * Fix #2824 by always spawning traps at the arena height * Fix regression where the gg considered players in spec mode * Fix landmines better * Fix block break position lol
This commit is contained in:
1 parent
e7b5cfd02e
commit
a559131772
5 files changed
+220
-248
No files matched your search
@@ -29,7 +29,6 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
import net.minecraft.item.ItemArmor.ArmorMaterial;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraftforge.common.util.EnumHelper;
|
||||
import net.minecraftforge.fml.common.Loader;
|
||||
@@ -56,8 +55,8 @@ import vazkii.botania.api.wiki.SimpleWikiProvider;
|
||||
import vazkii.botania.api.wiki.WikiHooks;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
@@ -97,8 +96,9 @@ public final class BotaniaAPI {
|
||||
public static final Map<Block, PropertyEnum<EnumDyeColor>> paintableBlocks = new LinkedHashMap<>();
|
||||
public static final Set<String> magnetBlacklist = new LinkedHashSet<>();
|
||||
public static final Set<Class<? extends Entity>> gravityRodBlacklist = new LinkedHashSet<>();
|
||||
|
||||
|
||||
|
||||
public static final Set<Block> gaiaBreakBlacklist = new HashSet<>();
|
||||
|
||||
public static final ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16,
|
||||
new int[] { 2, 5, 6, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0);
|
||||
public static final ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20);
|
||||
@@ -243,6 +243,8 @@ public final class BotaniaAPI {
|
||||
registerSemiDisposableBlock("stoneBasalt"); // Vanilla
|
||||
registerSemiDisposableBlock("stoneDiorite"); // Vanilla
|
||||
registerSemiDisposableBlock("stoneGranite"); // Vanilla
|
||||
|
||||
blacklistBlockFromGaiaGuardian(Blocks.BEACON);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -667,4 +669,7 @@ public final class BotaniaAPI {
|
||||
return "bm_" + block.getTranslationKey() + "@" + meta;
|
||||
}
|
||||
|
||||
public static void blacklistBlockFromGaiaGuardian(Block block) {
|
||||
gaiaBreakBlacklist.add(block);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user