mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 19:39:22 +00:00
Fluid API rework (#5983)
- Moved forge fluids into FluidAttributes companion object to the vanilla Fluid. By gigaherz - Redesigned the Fluid API to be closer to the Items API. By King Lemming Co-authored-by: King Lemming <[email protected]>
This commit is contained in:
1 parent
e784a7f606
commit
b7e1cc5f6b
48 files changed
+1077
-2193
No files matched your search
@@ -71,7 +71,6 @@ import net.minecraftforge.event.entity.player.PlayerEvent;
|
||||
import net.minecraftforge.fml.event.lifecycle.GatherDataEvent;
|
||||
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
|
||||
import net.minecraftforge.items.CapabilityItemHandler;
|
||||
import net.minecraftforge.fluids.UniversalBucket;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import org.apache.logging.log4j.Marker;
|
||||
import org.apache.logging.log4j.MarkerManager;
|
||||
@@ -98,8 +97,6 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook
|
||||
return INSTANCE;
|
||||
}
|
||||
|
||||
public UniversalBucket universalBucket;
|
||||
|
||||
public ForgeMod()
|
||||
{
|
||||
LOGGER.info(FORGEMOD,"Forge mod loading, version {}, for MC {} with MCP {}", ForgeVersion.getVersion(), MCPVersion.getMCVersion(), MCPVersion.getMCPVersion());
|
||||
@@ -158,7 +155,6 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook
|
||||
DimensionManager.writeRegistry(dims);
|
||||
if (!dims.isEmpty())
|
||||
forgeData.put("dims", dims);
|
||||
// TODO fluids FluidRegistry.writeDefaultFluidList(forgeData);
|
||||
return forgeData;
|
||||
}
|
||||
|
||||
@@ -167,7 +163,6 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook
|
||||
{
|
||||
if (tag.contains("dims", 10))
|
||||
DimensionManager.readRegistry(tag.getCompound("dims"));
|
||||
// TODO fluids FluidRegistry.loadFluidDefaults(tag);
|
||||
}
|
||||
|
||||
public void mappingChanged(FMLModIdMappingEvent evt)
|
||||
|
||||
@@ -27,6 +27,7 @@ import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.fluid.Fluid;
|
||||
import net.minecraft.fluid.Fluids;
|
||||
import net.minecraft.fluid.IFluidState;
|
||||
import net.minecraft.tags.Tag;
|
||||
import net.minecraft.util.BlockRenderLayer;
|
||||
@@ -35,6 +36,7 @@ import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.Explosion;
|
||||
import net.minecraft.world.IWorldReader;
|
||||
import net.minecraftforge.fluids.FluidAttributes;
|
||||
|
||||
public interface IForgeFluid
|
||||
{
|
||||
@@ -117,4 +119,9 @@ public interface IForgeFluid
|
||||
* This should be used in favor of TagCollection.getOwningTags, as this caches the result and automatically updates when the TagCollection changes.
|
||||
*/
|
||||
Set<ResourceLocation> getTags();
|
||||
|
||||
/**
|
||||
* Retrieves the non-vanilla fluid attributes, including localized name.
|
||||
*/
|
||||
FluidAttributes getAttributes();
|
||||
}
|
||||
@@ -19,8 +19,6 @@
|
||||
|
||||
package net.minecraftforge.common.network;
|
||||
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
|
||||
import org.apache.logging.log4j.Level;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
Reference in new issue
Block a user