diff options
| author | Jakub <53441451+kuba6000@users.noreply.github.com> | 2022-08-29 16:04:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-29 16:04:28 +0200 |
| commit | 7d1f51a8937e0a86486267437d444696e81e8aa0 (patch) | |
| tree | a5b145e7271998f7b4b968a2212ed487e54a92b5 /src/main/java/gtPlusPlus/plugin/villagers | |
| parent | 5267969156d30b4bb5f4cb2279ebb49db6bd40e2 (diff) | |
| download | GT5-Unofficial-7d1f51a8937e0a86486267437d444696e81e8aa0.tar.gz GT5-Unofficial-7d1f51a8937e0a86486267437d444696e81e8aa0.tar.bz2 GT5-Unofficial-7d1f51a8937e0a86486267437d444696e81e8aa0.zip | |
Buildscript + Spotless (#318)
* Convert AES.java to readable class
* Buildscript
* Spotless
Diffstat (limited to 'src/main/java/gtPlusPlus/plugin/villagers')
16 files changed, 11544 insertions, 2699 deletions
diff --git a/src/main/java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java b/src/main/java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java index 09e4c4865f..3eba3333b4 100644 --- a/src/main/java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java @@ -2,129 +2,135 @@ package gtPlusPlus.plugin.villagers; import static gtPlusPlus.plugin.villagers.VillagerUtils.mVillagerMap; -import java.util.HashMap; - import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.VillagerRegistry; import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; import gtPlusPlus.api.interfaces.IPlugin; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.entity.EntityPrimedMiningExplosive; -import gtPlusPlus.core.entity.monster.EntityGiantChickenBase; -import gtPlusPlus.core.entity.monster.EntitySickBlaze; -import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.plugin.manager.Core_Manager; -import gtPlusPlus.plugin.villagers.block.BlockGenericSpawner; import gtPlusPlus.plugin.villagers.entity.EntityBaseVillager; import gtPlusPlus.plugin.villagers.entity.EntityNativeAustralian; import gtPlusPlus.plugin.villagers.trade.TradeHandlerAboriginal; import gtPlusPlus.plugin.villagers.trade.TradeHandlerBanker; import gtPlusPlus.plugin.villagers.trade.TradeHandlerTechnician; import gtPlusPlus.plugin.villagers.trade.TradeHandlerTrader; +import java.util.HashMap; import net.minecraft.util.ResourceLocation; public class Core_VillagerAdditions implements IPlugin { - public final static Core_VillagerAdditions mInstance; - private static boolean shouldLoad = false; + public static final Core_VillagerAdditions mInstance; + private static boolean shouldLoad = false; + + public static final HashMap<Integer, ResourceLocation> mVillagerSkins = new HashMap<Integer, ResourceLocation>(); + public static final AutoMap<Pair<Integer, IVillageTradeHandler>> mVillagerTrades = + new AutoMap<Pair<Integer, IVillageTradeHandler>>(); - public static final HashMap<Integer, ResourceLocation> mVillagerSkins = new HashMap<Integer, ResourceLocation>(); - public static final AutoMap<Pair<Integer, IVillageTradeHandler>> mVillagerTrades = new AutoMap<Pair<Integer, IVillageTradeHandler>>(); + static { + mInstance = new Core_VillagerAdditions(); + Core_Manager.registerPlugin(mInstance); + mInstance.log("Preparing " + mInstance.getPluginName() + " for use."); + } - static { - mInstance = new Core_VillagerAdditions(); - Core_Manager.registerPlugin(mInstance); - mInstance.log("Preparing "+mInstance.getPluginName()+" for use."); - } + @Override + public boolean preInit() { + if ( + /*CORE.ConfigSwitches.enableSulfuricAcidFix || */ CORE.DEVENV) { + shouldLoad = true; + } + if (shouldLoad) { + // Register Custom Villager Entity + EntityRegistry.registerGlobalEntityID( + EntityBaseVillager.class, + "WiseVillager", + EntityRegistry.findGlobalUniqueEntityId(), + Utils.rgbtoHexValue(180, 120, 120), + Utils.rgbtoHexValue(0, 0, 0)); + EntityRegistry.registerGlobalEntityID( + EntityNativeAustralian.class, + "Aboriginal", + EntityRegistry.findGlobalUniqueEntityId(), + Utils.rgbtoHexValue(50, 50, 50), + Utils.rgbtoHexValue(25, 25, 25)); + VillagerUtils.registerNewVillager(0, "Banker", "Banker", "Banker", "banker", new TradeHandlerBanker()); + VillagerUtils.registerNewVillager( + 1, "Technician", "Technician", "Technician", "technician", new TradeHandlerTechnician()); + VillagerUtils.registerNewVillager(2, "Trader", "Trader", "Trader", "trader", new TradeHandlerTrader()); + VillagerUtils.registerNewVillager( + 3, "Aboriginal", "Aboriginal", "Aboriginal", "aboriginal", new TradeHandlerAboriginal()); - @Override - public boolean preInit() { - if (/*CORE.ConfigSwitches.enableSulfuricAcidFix || */CORE.DEVENV) { - shouldLoad = true; - } - if (shouldLoad) { - //Register Custom Villager Entity - EntityRegistry.registerGlobalEntityID(EntityBaseVillager.class, "WiseVillager", EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(180, 120, 120), Utils.rgbtoHexValue(0, 0, 0)); - EntityRegistry.registerGlobalEntityID(EntityNativeAustralian.class, "Aboriginal", EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(50, 50, 50), Utils.rgbtoHexValue(25, 25, 25)); - VillagerUtils.registerNewVillager(0, "Banker", "Banker", "Banker", "banker", new TradeHandlerBanker()); - VillagerUtils.registerNewVillager(1, "Technician", "Technician", "Technician", "technician", new TradeHandlerTechnician()); - VillagerUtils.registerNewVillager(2, "Trader", "Trader", "Trader", "trader", new TradeHandlerTrader()); - VillagerUtils.registerNewVillager(3, "Aboriginal", "Aboriginal", "Aboriginal", "aboriginal", new TradeHandlerAboriginal()); - - if (mVillagerMap.size() > 0) { - for (VillagerObject g : mVillagerMap.values()) { - if (g != null && g.mID >= 0) { - VillagerRegistry.instance().registerVillagerId(7735+g.mID); - log("Registered a Custom Villager with ID of "+g.mID+"."); - //Utils.createNewMobSpawner(10+g.mID, EntityBaseVillager.class); - if (mVillagerSkins.get(g.mID) != null) { - VillagerRegistry.instance().registerVillagerSkin(7735+g.mID, mVillagerSkins.get(g.mID)); - log("Registered a Custom Skin for Villager with ID of "+g.mID+"."); - } - } - } - } - - //Register all Villager ID's and their Custom Trades. - if (mVillagerTrades.size() > 0) { - for (Pair<Integer, IVillageTradeHandler> g : mVillagerTrades) { - if (g != null && g.getKey() != null) { - if (g.getValue() != null) { - VillagerRegistry.instance().registerVillageTradeHandler(g.getKey(), g.getValue()); - log("Registered a Custom Trade for Villager with ID of "+g.getKey()+"."); - } - } - } - } - return true; - } - return false; - } + if (mVillagerMap.size() > 0) { + for (VillagerObject g : mVillagerMap.values()) { + if (g != null && g.mID >= 0) { + VillagerRegistry.instance().registerVillagerId(7735 + g.mID); + log("Registered a Custom Villager with ID of " + g.mID + "."); + // Utils.createNewMobSpawner(10+g.mID, EntityBaseVillager.class); + if (mVillagerSkins.get(g.mID) != null) { + VillagerRegistry.instance().registerVillagerSkin(7735 + g.mID, mVillagerSkins.get(g.mID)); + log("Registered a Custom Skin for Villager with ID of " + g.mID + "."); + } + } + } + } - @Override - public boolean init() { - if (shouldLoad) { - return true; - } - return false; - } + // Register all Villager ID's and their Custom Trades. + if (mVillagerTrades.size() > 0) { + for (Pair<Integer, IVillageTradeHandler> g : mVillagerTrades) { + if (g != null && g.getKey() != null) { + if (g.getValue() != null) { + VillagerRegistry.instance().registerVillageTradeHandler(g.getKey(), g.getValue()); + log("Registered a Custom Trade for Villager with ID of " + g.getKey() + "."); + } + } + } + } + return true; + } + return false; + } - @Override - public boolean postInit() { - if (shouldLoad) { - return true; - } - return false; - } + @Override + public boolean init() { + if (shouldLoad) { + return true; + } + return false; + } - @Override - public boolean serverStart() { - if (shouldLoad) { - return true; - } - return false; - } + @Override + public boolean postInit() { + if (shouldLoad) { + return true; + } + return false; + } - @Override - public boolean serverStop() { - if (shouldLoad) { - return true; - } - return false; - } + @Override + public boolean serverStart() { + if (shouldLoad) { + return true; + } + return false; + } - @Override - public String getPluginName() { - return "GT++ Enhanced Villagers"; - } + @Override + public boolean serverStop() { + if (shouldLoad) { + return true; + } + return false; + } - @Override - public String getPluginAbbreviation() { - return "Bank"; - } + @Override + public String getPluginName() { + return "GT++ Enhanced Villagers"; + } + @Override + public String getPluginAbbreviation() { + return "Bank"; + } } diff --git a/src/main/java/gtPlusPlus/plugin/villagers/NameLists.java b/src/main/java/gtPlusPlus/plugin/villagers/NameLists.java index e9cd254503..3c5eccbcc2 100644 --- a/src/main/java/gtPlusPlus/plugin/villagers/NameLists.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/NameLists.java @@ -1,994 +1,9782 @@ package gtPlusPlus.plugin.villagers; -import org.apache.commons.lang3.StringUtils; - import gtPlusPlus.core.util.math.MathUtils; +import org.apache.commons.lang3.StringUtils; public class NameLists { - public static final String[] mFirstNames; - public static final String[] mLastNames; - public static final String[] mScottishFirstNames; - - static { - mFirstNames = generateFirstNames(); - mLastNames = generateLastNames(); - mScottishFirstNames = generateScottishFirstNames(); - } + public static final String[] mFirstNames; + public static final String[] mLastNames; + public static final String[] mScottishFirstNames; + + static { + mFirstNames = generateFirstNames(); + mLastNames = generateLastNames(); + mScottishFirstNames = generateScottishFirstNames(); + } + private static final String[] generateScottishFirstNames() { + return new String[] { + "Aadam", + "Aadit", + "Aahron", + "Aaran", + "Aaren", + "Aarez", + "Aarman", + "Aaron", + "Aaron-James", + "Aarron", + "Aaryan", + "Aaryn", + "Aayan", + "Aazaan", + "Abaan", + "Abbas", + "Abdallah", + "Abdalroof", + "Abdihakim", + "Abdirahman", + "Abdisalam", + "Abdul", + "Abdul-Aziz", + "Abdulbasir", + "Abdulkadir", + "Abdulkarem", + "Abdulkhader", + "Abdullah", + "Abdul-Majeed", + "Abdulmalik", + "Abdul-Rehman", + "Abdur", + "Abdurraheem", + "Abdur-Rahman", + "Abdur-Rehmaan", + "Abel", + "Abhinav", + "Abhisumant", + "Abid", + "Abir", + "Abraham", + "Abu", + "Abubakar", + "Ace", + "Adain", + "Adam", + "Adam-James", + "Addison", + "Addisson", + "Adegbola", + "Adegbolahan", + "Aden", + "Adenn", + "Adie", + "Adil", + "Aditya", + "Adnan", + "Adrian", + "Adrien", + "Aedan", + "Aedin", + "Aedyn", + "Aeron", + "Afonso", + "Ahmad", + "Ahmed", + "Ahmed-Aziz", + "Ahoua", + "Ahtasham", + "Aiadan", + "Aidan", + "Aiden", + "Aiden-Jack", + "Aiden-Vee", + "Aidian", + "Aidy", + "Ailin", + "Aiman", + "Ainsley", + "Ainslie", + "Airen", + "Airidas", + "Airlie", + "AJ", + "Ajay", + "A-Jay", + "Ajayraj", + "Akan", + "Akram", + "Al", + "Ala'", + "Alan", + "Alanas", + "Alasdair", + "Alastair", + "Alber", + "Albert", + "Albie", + "Aldred", + "Alec", + "Aled", + "Aleem", + "Aleksandar", + "Aleksander", + "Aleksandr", + "Aleksandrs", + "Alekzander", + "Alessandro", + "Alessio", + "Alex", + "Alexander", + "Alexei", + "Alexx", + "Alexzander", + "Alf", + "Alfee", + "Alfie", + "Alfred", + "Alfy", + "Alhaji", + "Al-Hassan", + "Ali", + "Aliekber", + "Alieu", + "Alihaider", + "Alisdair", + "Alishan", + "Alistair", + "Alistar", + "Alister", + "Aliyaan", + "Allan", + "Allan-Laiton", + "Allen", + "Allesandro", + "Allister", + "Ally", + "Alphonse", + "Altyiab", + "Alum", + "Alvern", + "Alvin", + "Alyas", + "Amaan", + "Aman", + "Amani", + "Ambanimoh", + "Ameer", + "Amgad", + "Ami", + "Amin", + "Amir", + "Ammaar", + "Ammar", + "Ammer", + "Amolpreet", + "Amos", + "Amrinder", + "Amrit", + "Amro", + "Anay", + "Andrea", + "Andreas", + "Andrei", + "Andrejs", + "Andrew", + "Andy", + "Anees", + "Anesu", + "Angel", + "Angelo", + "Angus", + "Anir", + "Anis", + "Anish", + "Anmolpreet", + "Annan", + "Anndra", + "Anselm", + "Anthony", + "Anthony-John", + "Antoine", + "Anton", + "Antoni", + "Antonio", + "Antony", + "Antonyo", + "Anubhav", + "Aodhan", + "Aon", + "Aonghus", + "Apisai", + "Arafat", + "Aran", + "Arandeep", + "Arann", + "Aray", + "Arayan", + "Archibald", + "Archie", + "Arda", + "Ardal", + "Ardeshir", + "Areeb", + "Areez", + "Aref", + "Arfin", + "Argyle", + "Argyll", + "Ari", + "Aria", + "Arian", + "Arihant", + "Aristomenis", + "Aristotelis", + "Arjuna", + "Arlo", + "Armaan", + "Arman", + "Armen", + "Arnab", + "Arnav", + "Arnold", + "Aron", + "Aronas", + "Arran", + "Arrham", + "Arron", + "Arryn", + "Arsalan", + "Artem", + "Arthur", + "Artur", + "Arturo", + "Arun", + "Arunas", + "Arved", + "Arya", + "Aryan", + "Aryankhan", + "Aryian", + "Aryn", + "Asa", + "Asfhan", + "Ash", + "Ashlee-jay", + "Ashley", + "Ashton", + "Ashton-Lloyd", + "Ashtyn", + "Ashwin", + "Asif", + "Asim", + "Aslam", + "Asrar", + "Ata", + "Atal", + "Atapattu", + "Ateeq", + "Athol", + "Athon", + "Athos-Carlos", + "Atli", + "Atom", + "Attila", + "Aulay", + "Aun", + "Austen", + "Austin", + "Avani", + "Averon", + "Avi", + "Avinash", + "Avraham", + "Awais", + "Awwal", + "Axel", + "Ayaan", + "Ayan", + "Aydan", + "Ayden", + "Aydin", + "Aydon", + "Ayman", + "Ayomide", + "Ayren", + "Ayrton", + "Aytug", + "Ayub", + "Ayyub", + "Azaan", + "Azedine", + "Azeem", + "Azim", + "Aziz", + "Azlan", + "Azzam", + "Azzedine", + "Babatunmise", + "Babur", + "Bader", + "Badr", + "Badsha", + "Bailee", + "Bailey", + "Bailie", + "Bailley", + "Baillie", + "Baley", + "Balian", + "Banan", + "Barath", + "Barkley", + "Barney", + "Baron", + "Barrie", + "Barry", + "Bartlomiej", + "Bartosz", + "Basher", + "Basile", + "Baxter", + "Baye", + "Bayley", + "Beau", + "Beinn", + "Bekim", + "Believe", + "Ben", + "Bendeguz", + "Benedict", + "Benjamin", + "Benjamyn", + "Benji", + "Benn", + "Bennett", + "Benny", + "Benoit", + "Bentley", + "Berkay", + "Bernard", + "Bertie", + "Bevin", + "Bezalel", + "Bhaaldeen", + "Bharath", + "Bilal", + "Bill", + "Billy", + "Binod", + "Bjorn", + "Blaike", + "Blaine", + "Blair", + "Blaire", + "Blake", + "Blazej", + "Blazey", + "Blessing", + "Blue", + "Blyth", + "Bo", + "Boab", + "Bob", + "Bobby", + "Bobby-Lee", + "Bodhan", + "Boedyn", + "Bogdan", + "Bohbi", + "Bony", + "Bowen", + "Bowie", + "Boyd", + "Bracken", + "Brad", + "Bradan", + "Braden", + "Bradley", + "Bradlie", + "Bradly", + "Brady", + "Bradyn", + "Braeden", + "Braiden", + "Brajan", + "Brandan", + "Branden", + "Brandon", + "Brandonlee", + "Brandon-Lee", + "Brandyn", + "Brannan", + "Brayden", + "Braydon", + "Braydyn", + "Breandan", + "Brehme", + "Brendan", + "Brendon", + "Brendyn", + "Breogan", + "Bret", + "Brett", + "Briaddon", + "Brian", + "Brodi", + "Brodie", + "Brody", + "Brogan", + "Broghan", + "Brooke", + "Brooklin", + "Brooklyn", + "Bruce", + "Bruin", + "Bruno", + "Brunon", + "Bryan", + "Bryce", + "Bryden", + "Brydon", + "Brydon-Craig", + "Bryn", + "Brynmor", + "Bryson", + "Buddy", + "Bully", + "Burak", + "Burhan", + "Butali", + "Butchi", + "Byron", + "Cabhan", + "Cadan", + "Cade", + "Caden", + "Cadon", + "Cadyn", + "Caedan", + "Caedyn", + "Cael", + "Caelan", + "Caelen", + "Caethan", + "Cahl", + "Cahlum", + "Cai", + "Caidan", + "Caiden", + "Caiden-Paul", + "Caidyn", + "Caie", + "Cailaen", + "Cailean", + "Caileb-John", + "Cailin", + "Cain", + "Caine", + "Cairn", + "Cal", + "Calan", + "Calder", + "Cale", + "Calean", + "Caleb", + "Calen", + "Caley", + "Calib", + "Calin", + "Callahan", + "Callan", + "Callan-Adam", + "Calley", + "Callie", + "Callin", + "Callum", + "Callun", + "Callyn", + "Calum", + "Calum-James", + "Calvin", + "Cambell", + "Camerin", + "Cameron", + "Campbel", + "Campbell", + "Camron", + "Caolain", + "Caolan", + "Carl", + "Carlo", + "Carlos", + "Carrich", + "Carrick", + "Carson", + "Carter", + "Carwyn", + "Casey", + "Casper", + "Cassy", + "Cathal", + "Cator", + "Cavan", + "Cayden", + "Cayden-Robert", + "Cayden-Tiamo", + "Ceejay", + "Ceilan", + "Ceiran", + "Ceirin", + "Ceiron", + "Cejay", + "Celik", + "Cephas", + "Cesar", + "Cesare", + "Chad", + "Chaitanya", + "Chang-Ha", + "Charles", + "Charley", + "Charlie", + "Charly", + "Chase", + "Che", + "Chester", + "Chevy", + "Chi", + "Chibudom", + "Chidera", + "Chimsom", + "Chin", + "Chintu", + "Chiqal", + "Chiron", + "Chris", + "Chris-Daniel", + "Chrismedi", + "Christian", + "Christie", + "Christoph", + "Christopher", + "Christopher-Lee", + "Christy", + "Chu", + "Chukwuemeka", + "Cian", + "Ciann", + "Ciar", + "Ciaran", + "Ciarian", + "Cieran", + "Cillian", + "Cillin", + "Cinar", + "CJ", + "C-Jay", + "Clark", + "Clarke", + "Clayton", + "Clement", + "Clifford", + "Clyde", + "Cobain", + "Coban", + "Coben", + "Cobi", + "Cobie", + "Coby", + "Codey", + "Codi", + "Codie", + "Cody", + "Cody-Lee", + "Coel", + "Cohan", + "Cohen", + "Colby", + "Cole", + "Colin", + "Coll", + "Colm", + "Colt", + "Colton", + "Colum", + "Colvin", + "Comghan", + "Conal", + "Conall", + "Conan", + "Conar", + "Conghaile", + "Conlan", + "Conley", + "Conli", + "Conlin", + "Conlly", + "Conlon", + "Conlyn", + "Connal", + "Connall", + "Connan", + "Connar", + "Connel", + "Connell", + "Conner", + "Connolly", + "Connor", + "Connor-David", + "Conor", + "Conrad", + "Cooper", + "Copeland", + "Coray", + "Corben", + "Corbin", + "Corey", + "Corey-James", + "Corey-Jay", + "Cori", + "Corie", + "Corin", + "Cormac", + "Cormack", + "Cormak", + "Corran", + "Corrie", + "Cory", + "Cosmo", + "Coupar", + "Craig", + "Craig-James", + "Crawford", + "Creag", + "Crispin", + "Cristian", + "Crombie", + "Cruiz", + "Cruz", + "Cuillin", + "Cullen", + "Cullin", + "Curtis", + "Cyrus", + "Daanyaal", + "Daegan", + "Daegyu", + "Dafydd", + "Dagon", + "Dailey", + "Daimhin", + "Daithi", + "Dakota", + "Daksh", + "Dale", + "Dalong", + "Dalton", + "Damian", + "Damien", + "Damon", + "Dan", + "Danar", + "Dane", + "Danial", + "Daniel", + "Daniele", + "Daniel-James", + "Daniels", + "Daniil", + "Danish", + "Daniyal", + "Danniel", + "Danny", + "Dante", + "Danyal", + "Danyil", + "Danys", + "Daood", + "Dara", + "Darach", + "Daragh", + "Darcy", + "D'arcy", + "Dareh", + "Daren", + "Darien", + "Darius", + "Darl", + "Darn", + "Darrach", + "Darragh", + "Darrel", + "Darrell", + "Darren", + "Darrie", + "Darrius", + "Darroch", + "Darryl", + "Darryn", + "Darwyn", + "Daryl", + "Daryn", + "Daud", + "Daumantas", + "Davi", + "David", + "David-Jay", + "David-Lee", + "Davie", + "Davis", + "Davy", + "Dawid", + "Dawson", + "Dawud", + "Dayem", + "Daymian", + "Deacon", + "Deagan", + |
