Add thunder substrate for rainmaker (#95)

This commit is contained in:
dibbydoda authored and GitHub committed 2025-05-17 11:39:34 +02:00
1 parent 2a6f3771a3
commit 4c0b503b8b
8 files changed
+83 -32

No files matched your search

@@ -9,33 +9,37 @@ import net.minecraft.item.ItemStack;
public class RainSubstrate {
public enum WeatherState {
CLEAR,
RAIN,
STORM
}
/**
* Rain substrate capable of activating the rainmaker.
*/
public ItemStack item;
/**
* Duration of the rain shower triggered by this substrate in Minecraft ticks.
* Duration of the weather event triggered by this substrate in Minecraft ticks.
*/
public int duration;
/**
* Speed of activation sequence triggered.
*/
public float speed;
/**
* The type of weather triggered.
*/
public WeatherState weather;
public boolean reverse;
public RainSubstrate(ItemStack item, int duration, float speed) {
this(item, duration, speed, false);
public RainSubstrate(ItemStack item, float speed, WeatherState weather) {
this(item, 0, speed, weather);
}
public RainSubstrate(ItemStack item, float speed) {
this(item, 0, speed, true);
}
public RainSubstrate(ItemStack item, int duration, float speed, boolean reverse) {
public RainSubstrate(ItemStack item, int duration, float speed, WeatherState weather) {
this.item = item;
this.duration = duration;
this.speed = speed;
this.reverse = reverse;
this.weather = weather;
}
}
@@ -109,6 +109,7 @@ public class Constants implements IForestryConstants {
public static final int MACHINE_MAX_ENERGY = 5000;
public static final int RAINMAKER_RAIN_DURATION_IODINE = 10000;
public static final int RAINMAKER_RAIN_DURATION_PHOSPHORICIODINE = 10000;
public static final int STILL_DESTILLATION_DURATION = 100;
public static final int STILL_DESTILLATION_INPUT = 10;
@@ -78,6 +78,7 @@ public class ItemRegistryCore extends ItemRegistry {
/* Rainmaker */
public final ItemForestry iodineCharge;
public final ItemForestry phosphor;
public final ItemForestry phosphorCharge;
/* Misc */
public final ItemCraftingMaterial craftingMaterial;
@@ -181,8 +182,8 @@ public class ItemRegistryCore extends ItemRegistry {
// / RAINMAKER SUBSTRATES
iodineCharge = registerItem(new ItemForestry(), "iodineCapsule");
phosphor = registerItem(new ItemForestry(), "phosphor");
phosphorCharge = registerItem(new ItemForestry(), "phosphoricIodineCapsule");
// / BEE RESOURCES
beeswax = registerItem(new ItemForestry(), "beeswax");
@@ -26,16 +26,14 @@ public class InventoryRainmaker extends InventoryAdapterTile<TileMillRainmaker>
@Override
public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
if (slotIndex == SLOT_SUBSTRATE) {
if (getStackInSlot(SLOT_SUBSTRATE) != null) {
return false;
}
if (FuelManager.rainSubstrate.containsKey(itemStack) && tile.charge == 0 && tile.progress == 0) {
RainSubstrate substrate = FuelManager.rainSubstrate.get(itemStack);
if (tile.getWorld().isRaining() && substrate.reverse) {
return true;
} else if (!tile.getWorld().isRaining() && !substrate.reverse) {
return true;
}
return tile.isValidSubstrate(substrate);
}
}
return false;
}
@@ -10,6 +10,7 @@ package forestry.factory.tiles;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.storage.WorldInfo;
import forestry.api.fuels.FuelManager;
import forestry.api.fuels.RainSubstrate;
@@ -20,7 +21,7 @@ import forestry.factory.inventory.InventoryRainmaker;
public class TileMillRainmaker extends TileMill {
private int duration;
private boolean reverse;
private RainSubstrate.WeatherState weather;
public TileMillRainmaker() {
super(null);
@@ -39,9 +40,9 @@ public class TileMillRainmaker extends TileMill {
}
// We don't have a gui, but we can be activated
if (FuelManager.rainSubstrate.containsKey(player.inventory.getCurrentItem()) && charge == 0) {
if (FuelManager.rainSubstrate.containsKey(player.inventory.getCurrentItem()) && charge == 0 && progress == 0) {
RainSubstrate substrate = FuelManager.rainSubstrate.get(player.inventory.getCurrentItem());
if (substrate.item.isItemEqual(player.inventory.getCurrentItem())) {
if (isValidSubstrate(substrate)) {
addCharge(substrate);
player.inventory.getCurrentItem().stackSize--;
}
@@ -49,6 +50,17 @@ public class TileMillRainmaker extends TileMill {
sendNetworkUpdate();
}
public boolean isValidSubstrate(RainSubstrate substrate) {
boolean thundering = getWorld().isThundering();
boolean raining = getWorld().isRaining();
return switch (substrate.weather) {
case CLEAR -> (thundering || raining);
case RAIN -> (thundering || !raining);
case STORM -> (!thundering);
};
}
@Override
public void readFromNBT(NBTTagCompound nbttagcompound) {
super.readFromNBT(nbttagcompound);
@@ -57,7 +69,7 @@ public class TileMillRainmaker extends TileMill {
progress = nbttagcompound.getFloat("Progress");
stage = nbttagcompound.getInteger("Stage");
duration = nbttagcompound.getInteger("Duration");
reverse = nbttagcompound.getBoolean("Reverse");
weather = RainSubstrate.WeatherState.valueOf(nbttagcompound.getString("Weather"));
}
@Override
@@ -68,14 +80,14 @@ public class TileMillRainmaker extends TileMill {
nbttagcompound.setFloat("Progress", progress);
nbttagcompound.setInteger("Stage", stage);
nbttagcompound.setInteger("Duration", duration);
nbttagcompound.setBoolean("Reverse", reverse);
nbttagcompound.setString("Weather", weather.name());
}
public void addCharge(RainSubstrate substrate) {
charge = 1;
speed = substrate.speed;
duration = substrate.duration;
reverse = substrate.reverse;
weather = substrate.weather;
sendNetworkUpdate();
}
@@ -103,15 +115,26 @@ public class TileMillRainmaker extends TileMill {
}
if (!worldObj.isRemote) {
if (reverse) {
worldObj.getWorldInfo().setRaining(false);
} else {
worldObj.getWorldInfo().setRaining(true);
worldObj.getWorldInfo().setRainTime(duration);
WorldInfo world = worldObj.getWorldInfo();
switch (weather) {
case CLEAR:
world.setRaining(false);
world.setThundering(false);
break;
case STORM:
world.setRaining(true);
world.setRainTime(duration);
world.setThundering(true);
world.setThunderTime(duration);
break;
case RAIN:
world.setRaining(true);
world.setRainTime(duration);
world.setThundering(false);
break;
}
charge = 0;
duration = 0;
reverse = false;
sendNetworkUpdate();
}
}
@@ -222,9 +222,23 @@ public class PluginFactory extends ForestryPlugin {
// Set rain substrates
ItemStack iodineCharge = coreItems.iodineCharge.getItemStack();
ItemStack dissipationCharge = coreItems.craftingMaterial.getDissipationCharge();
ItemStack phosphorCharge = coreItems.phosphorCharge.getItemStack();
FuelManager.rainSubstrate.put(
iodineCharge,
new RainSubstrate(
iodineCharge,
Constants.RAINMAKER_RAIN_DURATION_IODINE,
0.01f,
RainSubstrate.WeatherState.RAIN));
FuelManager.rainSubstrate
.put(iodineCharge, new RainSubstrate(iodineCharge, Constants.RAINMAKER_RAIN_DURATION_IODINE, 0.01f));
FuelManager.rainSubstrate.put(dissipationCharge, new RainSubstrate(dissipationCharge, 0.075f));
.put(dissipationCharge, new RainSubstrate(dissipationCharge, 0.075f, RainSubstrate.WeatherState.CLEAR));
FuelManager.rainSubstrate.put(
phosphorCharge,
new RainSubstrate(
phosphorCharge,
Constants.RAINMAKER_RAIN_DURATION_PHOSPHORICIODINE,
0.008f,
RainSubstrate.WeatherState.STORM));
for (BlockFactoryTesrType type : BlockFactoryTesrType.VALUES) {
MachineDefinition machineDefinition = new MachineDefinition(type);
@@ -594,6 +608,15 @@ public class PluginFactory extends ForestryPlugin {
PluginFluids.items.canEmpty,
'Z',
beeItems.honeydew);
RecipeManagers.carpenterManager.addRecipe(
5,
PluginCore.items.iodineCharge.getItemStack(),
PluginCore.items.phosphorCharge.getItemStack(),
"# #",
" # ",
"# #",
'#',
PluginCore.items.phosphor.getItemStack());
}
// Ender pearl