- Block info detection is still broken in 1.6.4 (working on fix)

- Fixed MFR Planter
- Added /mt biomes command to see list of biomes
- Added reloaded event
- Fixing MFR Harvester
This commit is contained in:
Stan Hebben committed 2014-08-09 15:36:19 +02:00
1 parent e2b4f50dfc
commit dfceec1fd4
29 files changed
+527 -40

No files matched your search

@@ -51,6 +51,25 @@ import stanhebben.zenscript.type.natives.JavaMethod;
* @author Stan Hebben
*/
public class MineTweakerAPI {
public static final String[] COLOR_NAMES = {
"White",
"Orange",
"Magenta",
"Light Blue",
"Yellow",
"Lime",
"Pink",
"Gray",
"Light Gray",
"Cyan",
"Purple",
"Blue",
"Brown",
"Green",
"Red",
"Black"
};
static {
List<Class> apiClasses = new ArrayList<Class>();
ClassRegistry.getClasses(apiClasses);
@@ -34,7 +34,10 @@ import minetweaker.api.recipes.IRecipeManager;
import minetweaker.api.server.ICommandFunction;
import minetweaker.api.server.ICommandValidator;
import minetweaker.api.server.IServer;
import minetweaker.api.world.IBiome;
import minetweaker.runtime.IScriptProvider;
import minetweaker.util.EventList;
import minetweaker.util.IEventHandler;
/**
* The implementation API is used by API implementations for internal communication
@@ -53,6 +56,7 @@ public class MineTweakerImplementationAPI {
private static final ListenPlayerLoggedIn LISTEN_LOGIN = new ListenPlayerLoggedIn();
private static final ListenPlayerLoggedOut LISTEN_LOGOUT = new ListenPlayerLoggedOut();
private static final ListenBlockInfo LISTEN_BLOCK_INFO = new ListenBlockInfo();
private static final EventList<ReloadEvent> ONRELOAD = new EventList<ReloadEvent>();
static {
minetweakerCommands = new HashMap<String, MineTweakerCommand>();
@@ -66,7 +70,7 @@ public class MineTweakerImplementationAPI {
@Override
public void execute(String[] arguments, IPlayer player) {
reload();
player.sendChat(platform.getMessage("Scripts reloaded"));
player.sendChat("Scripts reloaded");
}
}));
@@ -94,7 +98,7 @@ public class MineTweakerImplementationAPI {
}
if (player != null) {
player.sendChat(platform.getMessage("List generated; see minetweaker.log in your minecraft dir"));
player.sendChat("List generated; see minetweaker.log in your minecraft dir");
}
}
}));
@@ -116,7 +120,7 @@ public class MineTweakerImplementationAPI {
}
if (player != null) {
player.sendChat(platform.getMessage("List generated; see minetweaker.log in your minecraft dir"));
player.sendChat("List generated; see minetweaker.log in your minecraft dir");
}
}
}));
@@ -132,7 +136,7 @@ public class MineTweakerImplementationAPI {
for (int i = 0; i < player.getInventorySize(); i++) {
IItemStack stack = player.getInventoryStack(i);
if (stack != null) {
player.sendChat(platform.getMessage(stack.toString()));
player.sendChat(stack.toString());
}
}
}
@@ -148,7 +152,7 @@ public class MineTweakerImplementationAPI {
public void execute(String[] arguments, IPlayer player) {
IItemStack hand = player.getCurrentItem();
if (hand != null) {
player.sendChat(platform.getMessage(hand.toString()));
player.sendChat(hand.toString());
}
}
}));
@@ -167,7 +171,7 @@ public class MineTweakerImplementationAPI {
String entryName = arguments[0];
IOreDictEntry entry = MineTweakerAPI.oreDict.get(entryName);
if (entry.isEmpty()) {
player.sendChat(platform.getMessage("Entry doesn't exist"));
player.sendChat("Entry doesn't exist");
return;
} else {
MineTweakerAPI.logCommand("Ore entries for " + entryName + ":");
@@ -185,7 +189,7 @@ public class MineTweakerImplementationAPI {
}
}
}
player.sendChat(platform.getMessage("List generated; see minetweaker.log in your minecraft dir"));
player.sendChat("List generated; see minetweaker.log in your minecraft dir");
}
}));
@@ -200,7 +204,7 @@ public class MineTweakerImplementationAPI {
MineTweakerAPI.logCommand("Mods list:");
for (IMod mod : MineTweakerAPI.loadedMods) {
String message = mod.getId() + " - " + mod.getName() + " - " + mod.getVersion();
player.sendChat(platform.getMessage(message));
player.sendChat(message);
MineTweakerAPI.logCommand("Mod: " + message);
}
}
@@ -216,19 +220,19 @@ public class MineTweakerImplementationAPI {
@Override
public void execute(String[] arguments, IPlayer player) {
if (arguments.length < 1) {
player.sendChat(platform.getMessage("missing id parameter"));
player.sendChat("missing id parameter");
} else {
try {
int id = Integer.parseInt(arguments[0]);
IItemDefinition definition = platform.getItemDefinition(id);
if (definition == null) {
player.sendChat(platform.getMessage("no such item"));
player.sendChat("no such item");
} else {
StringBuilder description = new StringBuilder();
description.append('<');
description.append(definition.getId());
description.append('>');
player.sendChat(platform.getMessage(description.toString()));
player.sendChat(description.toString());
}
} catch (NumberFormatException e) {
MineTweakerAPI.logCommand("ID must be an integer");
@@ -273,6 +277,24 @@ public class MineTweakerImplementationAPI {
}
}));
minetweakerCommands.put("biomes", new MineTweakerCommand(
"biomes",
new String[] {
"/minetweaker biomes",
" Lists all the biomes in the game"
}, new ICommandFunction() {
@Override
public void execute(String[] arguments, IPlayer player) {
MineTweakerAPI.logCommand("Biomes:");
for (IBiome biome : MineTweakerAPI.game.getBiomes()) {
MineTweakerAPI.logCommand(" " + biome.getName());
}
player.sendChat("Biome list generated; see minetweaker.log in your minecraft dir");
}
}));
minetweakerCommands.put("blockinfo", new MineTweakerCommand(
"blockinfo",
new String[] {
@@ -288,10 +310,10 @@ public class MineTweakerImplementationAPI {
if (blockInfoPlayers.contains(player)) {
blockInfoPlayers.remove(player);
player.sendChat(platform.getMessage("Block info mode deactivated."));
player.sendChat("Block info mode deactivated.");
} else {
blockInfoPlayers.add(player);
player.sendChat(platform.getMessage("Block info mode activated. Right-click a block to see its data."));
player.sendChat("Block info mode activated. Right-click a block to see its data.");
}
if (blockInfoPlayers.isEmpty()) {
@@ -338,6 +360,16 @@ public class MineTweakerImplementationAPI {
MineTweakerAPI.loadedMods = mods;
}
/**
* Register an event handler to be fired upon reload.
*
* @param handler
* @return
*/
public static IEventHandle onReloadEvent(IEventHandler<ReloadEvent> handler) {
return ONRELOAD.add(handler);
}
/**
* Must be called upon server start.
*
@@ -386,19 +418,19 @@ public class MineTweakerImplementationAPI {
@Override
public void execute(String[] arguments, IPlayer player) {
if (arguments.length == 0) {
player.sendChat(platform.getMessage("Please provide a command. Use /mt help for more info."));
player.sendChat("Please provide a command. Use /mt help for more info.");
} else if (arguments[0].equals("help")) {
String[] keys = minetweakerCommands.keySet().toArray(new String[minetweakerCommands.size()]);
Arrays.sort(keys);
for (String key : keys) {
for (String helpMessage : minetweakerCommands.get(key).description) {
player.sendChat(platform.getMessage(helpMessage));
player.sendChat(helpMessage);
}
}
} else {
MineTweakerCommand command = minetweakerCommands.get(arguments[0]);
if (command == null) {
player.sendChat(platform.getMessage("No such minetweaker command available"));
player.sendChat("No such minetweaker command available");
} else {
command.function.execute(Arrays.copyOfRange(arguments, 1, arguments.length), player);
}
@@ -412,6 +444,8 @@ public class MineTweakerImplementationAPI {
}, null);
}
ONRELOAD.publish(new ReloadEvent());
MineTweakerAPI.tweaker.load();
if (MineTweakerAPI.server != null) {
@@ -430,6 +464,14 @@ public class MineTweakerImplementationAPI {
MineTweakerAPI.apply(new AddMineTweakerCommandAction(new MineTweakerCommand(name, description, function)));
}
// ############################
// ### Public inner classes ###
// ############################
public static class ReloadEvent {
}
// ######################
// ### Action classes ###
// ######################
@@ -523,11 +565,11 @@ public class MineTweakerImplementationAPI {
public void handle(PlayerInteractEvent event) {
if (blockInfoPlayers.contains(event.getPlayer())) {
IBlock block = event.getBlock();
event.getPlayer().sendChat(platform.getMessage("Block ID: " + block.getDefinition().getId()));
event.getPlayer().sendChat(platform.getMessage("Meta value: " + block.getMeta()));
event.getPlayer().sendChat("Block ID: " + block.getDefinition().getId());
event.getPlayer().sendChat("Meta value: " + block.getMeta());
IData data = block.getTileData();
if (data != null) {
event.getPlayer().sendChat(platform.getMessage("Tile entity data: " + data.asString()));
event.getPlayer().sendChat("Tile entity data: " + data.asString());
}
}
}
@@ -3,6 +3,7 @@ package minetweaker.api.game;
import java.util.List;
import minetweaker.api.item.IItemDefinition;
import minetweaker.api.liquid.ILiquidDefinition;
import minetweaker.api.world.IBiome;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenGetter;
@@ -28,4 +29,12 @@ public interface IGame {
*/
@ZenGetter("liquids")
public List<ILiquidDefinition> getLiquids();
/**
* Retrieves the biomes in this game.
*
* @return game biomes
*/
@ZenGetter("Biomes")
public List<IBiome> getBiomes();
}
@@ -8,7 +8,6 @@ package minetweaker.api.logger;
import java.util.ArrayList;
import java.util.List;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.api.player.IPlayer;
import minetweaker.runtime.ILogger;
@@ -34,7 +33,7 @@ public class MTLogger implements ILogger {
if (!unprocessed.isEmpty()) {
for (String message : unprocessed) {
player.sendChat(MineTweakerImplementationAPI.platform.getMessage(message));
player.sendChat(message);
}
}
}
@@ -73,7 +72,7 @@ public class MTLogger implements ILogger {
unprocessed.add(message2);
} else {
for (IPlayer player : players) {
player.sendChat(MineTweakerImplementationAPI.platform.getMessage(message2));
player.sendChat(message2);
}
}
}
@@ -90,7 +89,7 @@ public class MTLogger implements ILogger {
unprocessed.add(message2);
} else {
for (IPlayer player : players) {
player.sendChat(MineTweakerImplementationAPI.platform.getMessage(message2));
player.sendChat(message2);
}
}
}
@@ -35,6 +35,9 @@ public interface IPlayer {
@ZenMethod
public void sendChat(IChatMessage message);
@ZenMethod
public void sendChat(String message);
@ZenGetter("hotbarSize")
public int getHotbarSize();
@@ -0,0 +1,15 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package minetweaker.api.world;
/**
*
* @author Stan
*/
public interface IBiome {
public String getName();
}
@@ -12,6 +12,7 @@ import minetweaker.api.item.IItemStack;
import minetweaker.api.liquid.ILiquidStack;
import minetweaker.api.oredict.IOreDictEntry;
import minetweaker.api.player.IPlayer;
import minetweaker.api.world.IBiome;
import minetweaker.api.world.IDimension;
import minetweaker.mc164.block.MCBlockDefinition;
import minetweaker.mc164.block.MCSpecificBlock;
@@ -20,6 +21,7 @@ import minetweaker.mc164.data.NBTConverter;
import minetweaker.mc164.item.MCItemStack;
import minetweaker.mc164.oredict.MCOreDictEntry;
import minetweaker.mc164.player.MCPlayer;
import minetweaker.mc164.world.MCBiome;
import minetweaker.mc164.world.MCDimension;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
@@ -29,6 +31,7 @@ import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
@@ -39,6 +42,15 @@ import net.minecraftforge.oredict.OreDictionary;
*/
public class MineTweakerMC {
private static final Map<Block, MCBlockDefinition> blockDefinitions = new HashMap<Block, MCBlockDefinition>();
public static final IBiome[] biomes;
static {
biomes = new IBiome[BiomeGenBase.biomeList.length];
for (int i = 0; i < BiomeGenBase.biomeList.length; i++) {
if (BiomeGenBase.biomeList[i] != null)
biomes[i] = new MCBiome(BiomeGenBase.biomeList[i]);
}
}
private MineTweakerMC() {}
@@ -0,0 +1,31 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package minetweaker.mc164;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.api.minecraft.MineTweakerMC;
import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
/**
*
* @author Stan
*/
public class ForgeEventHandler {
@ForgeSubscribe
public void onPlayerInteract(PlayerInteractEvent ev) {
System.out.println("Player interact");
minetweaker.api.event.PlayerInteractEvent event = new minetweaker.api.event.PlayerInteractEvent(
MineTweakerMC.getIPlayer(ev.entityPlayer),
MineTweakerMC.getDimension(ev.entityPlayer.getEntityWorld()),
ev.x, ev.y, ev.z
);
MineTweakerImplementationAPI.events.publishPlayerInteract(event);
}
}
@@ -42,6 +42,8 @@ import minetweaker.runtime.providers.ScriptProviderDirectory;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.NetHandler;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.EventBus;
/**
* Main mod class. Performs some general logic, initialization of the API and
@@ -139,6 +141,8 @@ public class MineTweakerMod {
FuelTweaker.INSTANCE.register();
NetworkRegistry.instance().registerConnectionHandler(new MCConnectionHandler());
GameRegistry.registerCraftingHandler(new MTCraftingHandler());
MinecraftForge.EVENT_BUS.register(new ForgeEventHandler());
}
@EventHandler
@@ -12,6 +12,8 @@ import java.util.Map;
import minetweaker.api.game.IGame;
import minetweaker.api.item.IItemDefinition;
import minetweaker.api.liquid.ILiquidDefinition;
import minetweaker.api.minecraft.MineTweakerMC;
import minetweaker.api.world.IBiome;
import minetweaker.mc164.item.MCItemDefinition;
import minetweaker.mc164.liquid.MCLiquidDefinition;
import net.minecraft.item.Item;
@@ -45,4 +47,15 @@ public class MCGame implements IGame {
}
return result;
}
@Override
public List<IBiome> getBiomes() {
List<IBiome> result = new ArrayList<IBiome>();
for (IBiome biome : MineTweakerMC.biomes) {
if (biome != null) {
result.add(biome);
}
}
return result;
}
}
@@ -64,6 +64,11 @@ public class MCPlayer implements IPlayer {
player.sendChatToPlayer((ChatMessageComponent) internal);
}
@Override
public void sendChat(String message) {
player.sendChatToPlayer(ChatMessageComponent.createFromText(message));
}
@Override
public int getHotbarSize() {
return 9;
@@ -55,6 +55,11 @@ public class ServerPlayer implements IPlayer {
DedicatedServer.getServer().sendChatToPlayer((ChatMessageComponent) message.getInternal());
}
@Override
public void sendChat(String message) {
DedicatedServer.getServer().sendChatToPlayer(ChatMessageComponent.createFromText(message));
}
@Override
public int getHotbarSize() {
return 0;
@@ -0,0 +1,27 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package minetweaker.mc164.world;
import minetweaker.api.world.IBiome;
import net.minecraft.world.biome.BiomeGenBase;
/**
*
* @author Stan
*/
public class MCBiome implements IBiome {
private final BiomeGenBase biome;
public MCBiome(BiomeGenBase biome) {
this.biome = biome;
}
@Override
public String getName() {
return biome.biomeName;
}
}
@@ -0,0 +1,147 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package minetweaker.mods.mfr;
import java.util.Map;
import minetweaker.MineTweakerAPI;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.MineTweakerImplementationAPI.ReloadEvent;
import minetweaker.annotations.OnRegister;
import minetweaker.api.item.IItemStack;
import minetweaker.api.minecraft.MineTweakerMC;
import minetweaker.api.player.IPlayer;
import minetweaker.api.server.ICommandFunction;
import minetweaker.util.IEventHandler;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import powercrystals.core.random.WeightedRandomItemStack;
import powercrystals.minefactoryreloaded.api.IFactoryFertilizer;
import powercrystals.minefactoryreloaded.api.IFactoryFruit;
/**
*
* @author Stan
*/
public class MFRCommands {
private static final String[] DESCRIPTION = {
" MineFactory commands:",
" /minetweaker mfr fertilizers",
" Lists all fertilizers",
" /minetweaker mfr fruits",
" Lists all known fruit blocks",
" /minetweaker mfr laserores",
" Lists all ores known to the mining laser",
" /minetweaker mfr rubbertreebiomes",
" Lists all biomes for the rubber tree",
" /minetweaker mfr sludgedrops",
" Lists all sludge boiler drops"
};
@OnRegister
public static void onRegister() {
MineTweakerImplementationAPI.onReloadEvent(new IEventHandler<ReloadEvent>() {
@Override
public void handle(ReloadEvent event) {
MineTweakerImplementationAPI.addMineTweakerCommand("mfr", DESCRIPTION, new ICommandFunction() {
@Override
public void execute(String[] arguments, IPlayer player) {
if (arguments.length < 1) {
player.sendChat("Please specify a mfr command");
} else {
if (arguments[0].equals("fertilizers")) {
if (MFRHacks.fertilizers == null) {
player.sendChat("Could not load the fertilizer list");
} else {
MineTweakerAPI.logCommand("Fertilizers:");
for (Map.Entry<Integer, IFactoryFertilizer> fertilizer : MFRHacks.fertilizers.entrySet()) {
IItemStack item = MineTweakerMC.getItemStack(Item.itemsList[fertilizer.getKey()], 1, 0);
String message = "- " + item + " (" + item.getDisplayName() + ")";
MineTweakerAPI.logCommand(message);
}
player.sendChat("Fertilizer list generated; see minetweaker.log");
}
} else if (arguments[0].equals("fruits")) {
if (MFRHacks.fruitBlocks == null) {
player.sendChat("Could not load the fruit blocks list");
} else {
MineTweakerAPI.logCommand("Fruit Blocks:");
for (Map.Entry<Integer, IFactoryFruit> fruitBlock : MFRHacks.fruitBlocks.entrySet()) {
Block block = Block.blocksList[fruitBlock.getKey()];
String message = "- " + block.getUnlocalizedName() + " (" + block.getLocalizedName() + ")";
MineTweakerAPI.logCommand(message);
}
player.sendChat("Fluit blocks list generated; see minetweaker.log");
}
} else if (arguments[0].equals("laserores")) {
if (MFRHacks.laserOres == null) {
player.sendChat("Could not load the laser ores list");
} else {
MineTweakerAPI.logCommand("Laser ores:");
for (WeightedRandomItemStack randomItem : MFRHacks.laserOres) {
IItemStack item = MineTweakerMC.getIItemStack(randomItem.getStack());
MineTweakerAPI.logCommand(" (" + randomItem.itemWeight + "): " + item + " (" + item.getDisplayName() + ")");
}
player.sendChat("Laser ore list generated; see minetweaker.log");
}
if (MFRHacks.laserPreferredOres == null) {
player.sendChat("Could not load the laser preferred ores list");
} else {
for (int i = 0; i < MineTweakerAPI.COLOR_NAMES.length; i++) {
if (MFRHacks.laserPreferredOres.containsKey(i) && !MFRHacks.laserPreferredOres.get(i).isEmpty()) {
MineTweakerAPI.logCommand("Laser affinity " + i + " (" + MineTweakerAPI.COLOR_NAMES[i] + "):");
for (ItemStack item : MFRHacks.laserPreferredOres.get(i)) {
IItemStack iitem = MineTweakerMC.getIItemStack(item);
MineTweakerAPI.logCommand(" " + iitem + " (" + iitem.getDisplayName() + ")");
}
}
}
player.sendChat("Laser preferred ore list generated; see minetweaker.log");
}
} else if (arguments[0].equals("rubbertreebiomes")) {
if (MFRHacks.rubberTreeBiomes == null) {
player.sendChat("Could not load the rubber tree biomes");
} else {
MineTweakerAPI.logCommand("Rubber tree biomes:");
for (String biome : MFRHacks.rubberTreeBiomes) {
MineTweakerAPI.logCommand(" " + biome);
}
player.sendChat("Rubber tree biome list generated; see minetweaker.log");
}
} else if (arguments[0].equals("sludgedrops")) {
if (MFRHacks.sludgeDrops == null) {
player.sendChat("Could not load sludge drops");
} else {
MineTweakerAPI.logCommand("Sludge drops:");
for (WeightedRandomItemStack randomItem : MFRHacks.sludgeDrops) {
IItemStack item = MineTweakerMC.getIItemStack(randomItem.getStack());
MineTweakerAPI.logCommand(" (" + randomItem.itemWeight + "): " + item + " (" + item.getDisplayName() + ")");
}
player.sendChat("Sludge drop list generated; see minetweaker.log");
}
} else {
player.sendChat("Unknown mfr command: " + arguments[1]);
}
}
}
});
}
});
}
}
@@ -18,9 +18,12 @@ import minetweaker.MineTweakerAPI;
import minetweaker.annotations.ModOnly;
import minetweaker.api.block.IBlock;
import minetweaker.api.block.IBlockPattern;
import minetweaker.api.item.IItemStack;
import minetweaker.api.item.WeightedItemStack;
import minetweaker.api.minecraft.MineTweakerMC;
import minetweaker.mc164.block.MCBlockDefinition;
import minetweaker.mods.mfr.MFRHacks;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import powercrystals.minefactoryreloaded.api.FactoryRegistry;
@@ -38,6 +41,16 @@ import stanhebben.zenscript.annotations.ZenMethod;
@ZenClass("mods.mfr.Harvester")
@ModOnly("MineFactoryReloaded")
public class Harvester {
@ZenMethod
public static void addHarvestable(IItemStack item) {
addHarvestable(item.asBlock(), (WeightedItemStack[]) null, null);
}
@ZenMethod
public static void addHarvestable(IItemStack item, String type) {
addHarvestable(item.asBlock(), (WeightedItemStack[]) null, type);
}
@ZenMethod
public static void addHarvestable(IBlockPattern block, WeightedItemStack drop, @Optional String type) {
addHarvestable(block, new WeightedItemStack[] { drop }, type);
@@ -72,7 +85,7 @@ public class Harvester {
this.possibleDrops = possibleDrops;
HarvestType type = HarvestType.Normal;
if (stringType.equals("normal")) {
if (stringType == null || stringType.equals("normal")) {
type = HarvestType.Normal;
} else if (stringType.equals("column")) {
type = HarvestType.Column;
@@ -119,21 +132,27 @@ public class Harvester {
@Override
public boolean canBeHarvested(World world, Map<String, Boolean> map, int x, int y, int z) {
for (TweakerHarvestable fruit : harvestables) {
if (fruit.block.matches(MineTweakerMC.getBlock(world, x, y, z)))
for (TweakerHarvestable harvestable : harvestables) {
if (harvestable.block.matches(MineTweakerMC.getBlock(world, x, y, z)))
return true;
}
System.out.println("No blocks match");
return false;
}
@Override
public List<ItemStack> getDrops(World world, Random random, Map<String, Boolean> map, int x, int y, int z) {
IBlock block = MineTweakerMC.getBlock(world, x, y, z);
for (TweakerHarvestable harvestable : harvestables) {
if (harvestable.block.matches(block))
return Arrays.asList(MineTweakerMC.getItemStacks(WeightedItemStack.pickRandomDrops(random, harvestable.possibleDrops)));
if (harvestable.block.matches(block)) {
if (harvestable.possibleDrops == null) {
Block mcBlock = ((MCBlockDefinition) block.getDefinition()).getInternalBlock();
return mcBlock.getBlockDropped(world, x, y, z, block.getMeta(), 0);
} else {
return Arrays.asList(MineTweakerMC.getItemStacks(WeightedItemStack.pickRandomDrops(random, harvestable.possibleDrops)));
}
}
}
return Collections.EMPTY_LIST;
@@ -134,12 +134,19 @@ public class Planter {
@Override
public boolean canBePlantedHere(World world, int x, int y, int z, ItemStack seed) {
if (!world.isAirBlock(x, y, z))
return false;
for (TweakerPlantable plantable : plantables) {
if (!plantable.seed.matches(MineTweakerMC.getIItemStack(seed)))
if (!plantable.seed.matches(MineTweakerMC.getIItemStack(seed))) {
//System.out.println("Cannot plant (seed doesn't match)");
return false;
}
if (!plantable.canPlantOn.matches(MineTweakerMC.getBlock(world, x, y - 1, x)))
if (!plantable.canPlantOn.matches(MineTweakerMC.getBlock(world, x, y - 1, z))) {
//System.out.println("Cannot plant (not on the right block");
return false;
}
}
return true;
@@ -12,6 +12,7 @@ import minetweaker.api.item.IItemStack;
import minetweaker.api.liquid.ILiquidStack;
import minetweaker.api.oredict.IOreDictEntry;
import minetweaker.api.player.IPlayer;
import minetweaker.api.world.IBiome;
import minetweaker.api.world.IDimension;
import minetweaker.mc1710.block.MCBlockDefinition;
import minetweaker.mc1710.block.MCSpecificBlock;
@@ -21,6 +22,7 @@ import minetweaker.mc1710.oredict.MCOreDictEntry;
import minetweaker.mc1710.player.MCPlayer;
import minetweaker.mc1710.world.MCDimension;
import minetweaker.mc1710.block.MCWorldBlock;
import minetweaker.mc1710.world.MCBiome;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -29,6 +31,7 @@ import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
@@ -39,6 +42,15 @@ import net.minecraftforge.oredict.OreDictionary;
*/
public class MineTweakerMC {
private static final Map<Block, MCBlockDefinition> blockDefinitions = new HashMap<Block, MCBlockDefinition>();
public static final IBiome[] biomes;
static {
biomes = new IBiome[BiomeGenBase.getBiomeGenArray().length];
for (int i = 0; i < BiomeGenBase.getBiomeGenArray().length; i++) {
if (BiomeGenBase.getBiomeGenArray()[i] != null)
biomes[i] = new MCBiome(BiomeGenBase.getBiomeGenArray()[i]);
}
}
private MineTweakerMC() {}
@@ -19,8 +19,6 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent;
public class ForgeEventHandler {
@SubscribeEvent
public void onPlayerInteract(PlayerInteractEvent ev) {
System.out.println("Player interact");
minetweaker.api.event.PlayerInteractEvent event = new minetweaker.api.event.PlayerInteractEvent(
MineTweakerMC.getIPlayer(ev.entityPlayer),
MineTweakerMC.getDimension(ev.world),
@@ -29,9 +27,4 @@ public class ForgeEventHandler {
MineTweakerImplementationAPI.events.publishPlayerInteract(event);
}
@SubscribeEvent
public void onCrafted(PlayerEvent.ItemCraftedEvent ev) {
}
}
@@ -13,6 +13,8 @@ import java.util.Set;
import minetweaker.api.game.IGame;
import minetweaker.api.item.IItemDefinition;
import minetweaker.api.liquid.ILiquidDefinition;
import minetweaker.api.minecraft.MineTweakerMC;
import minetweaker.api.world.IBiome;
import minetweaker.mc1710.item.MCItemDefinition;
import minetweaker.mc1710.liquid.MCLiquidDefinition;
import net.minecraft.item.Item;
@@ -45,4 +47,15 @@ public class MCGame implements IGame {
}
return result;
}
@Override
public List<IBiome> getBiomes() {
List<IBiome> result = new ArrayList<IBiome>();
for (IBiome biome : MineTweakerMC.biomes) {
if (biome != null) {
result.add(biome);
}
}
return result;
}
}
@@ -17,6 +17,7 @@ import minetweaker.mc1710.data.NBTConverter;
import minetweaker.mc1710.network.MineTweakerOpenBrowserPacket;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.IChatComponent;
/**
@@ -64,6 +65,11 @@ public class MCPlayer implements IPlayer {
player.addChatMessage((IChatComponent) internal);
}
@Override
public void sendChat(String message) {
player.addChatMessage(new ChatComponentText(message));
}
@Override
public int getHotbarSize() {
return 9;
@@ -16,6 +16,7 @@ import minetweaker.api.data.IData;
import minetweaker.api.item.IItemStack;
import minetweaker.api.player.IPlayer;
import net.minecraft.server.dedicated.DedicatedServer;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.IChatComponent;
/**
@@ -55,6 +56,11 @@ public class ServerPlayer implements IPlayer {
DedicatedServer.getServer().addChatMessage((IChatComponent) message.getInternal());
}
@Override
public void sendChat(String message) {
DedicatedServer.getServer().addChatMessage(new ChatComponentText(message));
}
@Override
public int getHotbarSize() {
return 0;
@@ -0,0 +1,27 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package minetweaker.mc1710.world;
import minetweaker.api.world.IBiome;
import net.minecraft.world.biome.BiomeGenBase;
/**
*
* @author Stan
*/
public class MCBiome implements IBiome {
private final BiomeGenBase biome;
public MCBiome(BiomeGenBase biome) {
this.biome = biome;
}
@Override
public String getName() {
return biome.biomeName;
}
}
@@ -12,6 +12,7 @@ import minetweaker.api.item.IItemStack;
import minetweaker.api.liquid.ILiquidStack;
import minetweaker.api.oredict.IOreDictEntry;
import minetweaker.api.player.IPlayer;
import minetweaker.api.world.IBiome;
import minetweaker.api.world.IDimension;
import minetweaker.mc172.block.MCBlockDefinition;
import minetweaker.mc172.block.MCSpecificBlock;
@@ -20,6 +21,7 @@ import minetweaker.mc172.data.NBTConverter;
import minetweaker.mc172.item.MCItemStack;
import minetweaker.mc172.oredict.MCOreDictEntry;
import minetweaker.mc172.player.MCPlayer;
import minetweaker.mc172.world.MCBiome;
import minetweaker.mc172.world.MCDimension;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
@@ -29,6 +31,7 @@ import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
@@ -39,6 +42,15 @@ import net.minecraftforge.oredict.OreDictionary;
*/
public class MineTweakerMC {
private static final Map<Block, MCBlockDefinition> blockDefinitions = new HashMap<Block, MCBlockDefinition>();
public static final IBiome[] biomes;
static {
biomes = new IBiome[BiomeGenBase.getBiomeGenArray().length];
for (int i = 0; i < BiomeGenBase.getBiomeGenArray().length; i++) {
if (BiomeGenBase.getBiomeGenArray()[i] != null)
biomes[i] = new MCBiome(BiomeGenBase.getBiomeGenArray()[i]);
}
}
private MineTweakerMC() {}
@@ -8,6 +8,9 @@ package minetweaker.mc172;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.api.minecraft.MineTweakerMC;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
/**
*
@@ -15,7 +18,13 @@ import cpw.mods.fml.common.gameevent.PlayerEvent;
*/
public class ForgeEventHandler {
@SubscribeEvent
public void onCrafted(PlayerEvent.ItemCraftedEvent ev) {
public void onPlayerInteract(PlayerInteractEvent ev) {
minetweaker.api.event.PlayerInteractEvent event = new minetweaker.api.event.PlayerInteractEvent(
MineTweakerMC.getIPlayer(ev.entityPlayer),
MineTweakerMC.getDimension(ev.world),
ev.x, ev.y, ev.z
);
MineTweakerImplementationAPI.events.publishPlayerInteract(event);
}
}
@@ -94,7 +94,7 @@ public class MineTweakerMod {
@EventHandler
public void onLoad(FMLPreInitializationEvent ev) {
MinecraftForge.EVENT_BUS.register(new FMLEventHandler());
MinecraftForge.EVENT_BUS.register(new ForgeEventHandler());
FMLCommonHandler.instance().bus().register(new FMLEventHandler());
}
@@ -13,6 +13,8 @@ import java.util.Set;
import minetweaker.api.game.IGame;
import minetweaker.api.item.IItemDefinition;
import minetweaker.api.liquid.ILiquidDefinition;
import minetweaker.api.minecraft.MineTweakerMC;
import minetweaker.api.world.IBiome;
import minetweaker.mc172.item.MCItemDefinition;
import minetweaker.mc172.liquid.MCLiquidDefinition;
import net.minecraft.item.Item;
@@ -45,4 +47,15 @@ public class MCGame implements IGame {
}
return result;
}
@Override
public List<IBiome> getBiomes() {
List<IBiome> result = new ArrayList<IBiome>();
for (IBiome biome : MineTweakerMC.biomes) {
if (biome != null) {
result.add(biome);
}
}
return result;
}
}
@@ -17,6 +17,7 @@ import minetweaker.mc172.data.NBTConverter;
import minetweaker.mc172.network.MineTweakerOpenBrowserPacket;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.IChatComponent;
/**
@@ -65,6 +66,11 @@ public class MCPlayer implements IPlayer {
player.addChatMessage((IChatComponent) internal);
}
@Override
public void sendChat(String message) {
player.addChatMessage(new ChatComponentText(message));
}
@Override
public int getHotbarSize() {
return 9;
@@ -16,6 +16,7 @@ import minetweaker.api.data.IData;
import minetweaker.api.item.IItemStack;
import minetweaker.api.player.IPlayer;
import net.minecraft.server.dedicated.DedicatedServer;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.IChatComponent;
/**
@@ -55,6 +56,11 @@ public class ServerPlayer implements IPlayer {
DedicatedServer.getServer().addChatMessage((IChatComponent) message.getInternal());
}
@Override
public void sendChat(String message) {
DedicatedServer.getServer().addChatMessage(new ChatComponentText(message));
}
@Override
public int getHotbarSize() {
return 0;
@@ -0,0 +1,27 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package minetweaker.mc172.world;
import minetweaker.api.world.IBiome;
import net.minecraft.world.biome.BiomeGenBase;
/**
*
* @author Stan
*/
public class MCBiome implements IBiome {
private final BiomeGenBase biome;
public MCBiome(BiomeGenBase biome) {
this.biome = biome;
}
@Override
public String getName() {
return biome.biomeName;
}
}