mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 20:52:34 +00:00
Forge 1.19.4
Properly move `ServerStatusPing` to codec Reimplement custom display contexts Co-authored-by: Matyrobbrt <[email protected]> Co-authored-by: coehlrich <[email protected]> Signed-off-by: SizableShrimp <[email protected]>
This commit is contained in:
1 parent
1f44339d6e
commit
44c689f171
347 files changed
+2545
-2436
No files matched your search
@@ -1549,7 +1549,7 @@ public class ForgeHooks
|
||||
|
||||
private static String makePackFormatKey(PackType packType)
|
||||
{
|
||||
return "forge:" + packType.bridgeType.name().toLowerCase(Locale.ROOT) + "_pack_format";
|
||||
return "forge:" + packType.name().toLowerCase(Locale.ROOT) + "_pack_format";
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -483,7 +483,7 @@ public class ForgeMod
|
||||
ExistingFileHelper existingFileHelper = event.getExistingFileHelper();
|
||||
ForgeBlockTagsProvider blockTags = new ForgeBlockTagsProvider(packOutput, lookupProvider, existingFileHelper);
|
||||
gen.addProvider(event.includeServer(), blockTags);
|
||||
gen.addProvider(event.includeServer(), new ForgeItemTagsProvider(packOutput, lookupProvider, blockTags, existingFileHelper));
|
||||
gen.addProvider(event.includeServer(), new ForgeItemTagsProvider(packOutput, lookupProvider, blockTags.contentsGetter(), existingFileHelper));
|
||||
gen.addProvider(event.includeServer(), new ForgeEntityTypeTagsProvider(packOutput, lookupProvider, existingFileHelper));
|
||||
gen.addProvider(event.includeServer(), new ForgeFluidTagsProvider(packOutput, lookupProvider, existingFileHelper));
|
||||
gen.addProvider(event.includeServer(), new ForgeRecipeProvider(packOutput));
|
||||
|
||||
@@ -51,11 +51,11 @@ public interface IExtensibleEnum
|
||||
either -> either.map(
|
||||
str -> {
|
||||
var val = enumValueFromNameFunction.apply(str);
|
||||
return val != null ? DataResult.success(val) : DataResult.error("Unknown enum value name: " + str);
|
||||
return val != null ? DataResult.success(val) : DataResult.error(() -> "Unknown enum value name: " + str);
|
||||
},
|
||||
num -> {
|
||||
var values = valuesSupplier.get();
|
||||
return num >= 0 && num < values.length ? DataResult.success(values[num]) : DataResult.error("Unknown enum id: " + num);
|
||||
return num >= 0 && num < values.length ? DataResult.success(values[num]) : DataResult.error(() -> "Unknown enum id: " + num);
|
||||
}
|
||||
),
|
||||
value -> Either.left(value.getSerializedName())
|
||||
|
||||
@@ -351,7 +351,7 @@ public class TierSortingRegistry
|
||||
|
||||
private static void syncToPlayer(ServerPlayer serverPlayer)
|
||||
{
|
||||
if (SYNC_CHANNEL.isRemotePresent(serverPlayer.connection.getConnection()) && !serverPlayer.connection.getConnection().isMemoryConnection())
|
||||
if (SYNC_CHANNEL.isRemotePresent(serverPlayer.connection.connection) && !serverPlayer.connection.connection.isMemoryConnection())
|
||||
{
|
||||
SYNC_CHANNEL.send(PacketDistributor.PLAYER.with(() -> serverPlayer), new SyncPacket(sortedTiers.stream().map(TierSortingRegistry::getName).toList()));
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ import java.util.function.Consumer;
|
||||
|
||||
public final class ForgeItemTagsProvider extends ItemTagsProvider
|
||||
{
|
||||
public ForgeItemTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, TagsProvider<Block> blockTagProvider, ExistingFileHelper existingFileHelper)
|
||||
public ForgeItemTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, CompletableFuture<TagLookup<Block>> blockTagProvider, ExistingFileHelper existingFileHelper)
|
||||
{
|
||||
super(output, lookupProvider, blockTagProvider, "forge", existingFileHelper);
|
||||
}
|
||||
|
||||
@@ -543,8 +543,7 @@ public interface IForgeBlock
|
||||
@Nullable
|
||||
default BlockPathTypes getAdjacentBlockPathType(BlockState state, BlockGetter level, BlockPos pos, @Nullable Mob mob, BlockPathTypes originalType)
|
||||
{
|
||||
if (state.is(Blocks.CACTUS)) return BlockPathTypes.DANGER_CACTUS;
|
||||
else if (state.is(Blocks.SWEET_BERRY_BUSH)) return BlockPathTypes.DANGER_OTHER;
|
||||
if (state.is(Blocks.SWEET_BERRY_BUSH)) return BlockPathTypes.DANGER_OTHER;
|
||||
else if (WalkNodeEvaluator.isBurningBlock(state)) return BlockPathTypes.DANGER_FIRE;
|
||||
else return null;
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
package net.minecraftforge.common.extensions;
|
||||
|
||||
import net.minecraft.world.entity.player.Inventory;
|
||||
import net.minecraft.world.flag.FeatureFlags;
|
||||
import net.minecraft.world.inventory.AbstractContainerMenu;
|
||||
import net.minecraft.world.inventory.MenuType;
|
||||
import net.minecraft.network.FriendlyByteBuf;
|
||||
@@ -15,7 +16,7 @@ public interface IForgeMenuType<T>
|
||||
{
|
||||
static <T extends AbstractContainerMenu> MenuType<T> create(IContainerFactory<T> factory)
|
||||
{
|
||||
return new MenuType<>(factory);
|
||||
return new MenuType<>(factory, FeatureFlags.DEFAULT_FLAGS);
|
||||
}
|
||||
|
||||
T create(int windowId, Inventory playerInv, FriendlyByteBuf extraData);
|
||||
|
||||
@@ -42,7 +42,7 @@ public interface IGlobalLootModifier {
|
||||
catch (JsonSyntaxException e)
|
||||
{
|
||||
LootModifierManager.LOGGER.warn("Unable to decode loot conditions", e);
|
||||
return DataResult.error(e.getMessage());
|
||||
return DataResult.error(e::getMessage);
|
||||
}
|
||||
},
|
||||
conditions ->
|
||||
@@ -55,7 +55,7 @@ public interface IGlobalLootModifier {
|
||||
catch (JsonSyntaxException e)
|
||||
{
|
||||
LootModifierManager.LOGGER.warn("Unable to encode loot conditions", e);
|
||||
return DataResult.error(e.getMessage());
|
||||
return DataResult.error(e::getMessage);
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
@@ -69,6 +69,7 @@ import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.server.network.ServerGamePacketListenerImpl;
|
||||
import net.minecraft.stats.Stat;
|
||||
import net.minecraft.world.damagesource.DamageSource;
|
||||
import net.minecraft.world.entity.RelativeMovement;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraftforge.server.ServerLifecycleHooks;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
@@ -125,7 +126,6 @@ public class FakePlayer extends ServerPlayer
|
||||
@Override public void handleBlockEntityTagQuery(ServerboundBlockEntityTagQuery packet) { }
|
||||
@Override public void handleMovePlayer(ServerboundMovePlayerPacket packet) { }
|
||||
@Override public void teleport(double x, double y, double z, float yaw, float pitch) { }
|
||||
@Override public void teleport(double x, double y, double z, float yaw, float pitch, Set<ClientboundPlayerPositionPacket.RelativeArgument> flags) { }
|
||||
@Override public void handlePlayerAction(ServerboundPlayerActionPacket packet) { }
|
||||
@Override public void handleUseItemOn(ServerboundUseItemOnPacket packet) { }
|
||||
@Override public void handleUseItem(ServerboundUseItemPacket packet) { }
|
||||
@@ -153,8 +153,7 @@ public class FakePlayer extends ServerPlayer
|
||||
@Override public void handleCustomPayload(ServerboundCustomPayloadPacket packet) { }
|
||||
@Override public void handleChangeDifficulty(ServerboundChangeDifficultyPacket packet) { }
|
||||
@Override public void handleLockDifficulty(ServerboundLockDifficultyPacket packet) { }
|
||||
@Override public void dismount(double x, double y, double z, float yaw, float pitch) { }
|
||||
@Override public void teleport(double x, double y, double z, float yaw, float pitch, Set<ClientboundPlayerPositionPacket.RelativeArgument> relativeSet, boolean dismountVehicle) { }
|
||||
@Override public void teleport(double x, double y, double z, float yaw, float pitch, Set<RelativeMovement> relativeSet) { }
|
||||
@Override public void ackBlockChangesUpTo(int sequence) { }
|
||||
@Override public void handleChatCommand(ServerboundChatCommandPacket packet) { }
|
||||
@Override public void handleChatAck(ServerboundChatAckPacket packet) { }
|
||||
|
||||
@@ -14,7 +14,7 @@ import net.minecraft.world.level.biome.Biome.TemperatureModifier;
|
||||
*/
|
||||
public class ClimateSettingsBuilder
|
||||
{
|
||||
private Precipitation precipitation;
|
||||
private boolean hasPrecipitation;
|
||||
private float temperature;
|
||||
private TemperatureModifier temperatureModifier;
|
||||
private float downfall;
|
||||
@@ -25,11 +25,11 @@ public class ClimateSettingsBuilder
|
||||
*/
|
||||
public static ClimateSettingsBuilder copyOf(ClimateSettings settings)
|
||||
{
|
||||
return create(settings.precipitation(), settings.temperature(), settings.temperatureModifier(), settings.downfall());
|
||||
return create(settings.hasPrecipitation(), settings.temperature(), settings.temperatureModifier(), settings.downfall());
|
||||
}
|
||||
|
||||
/**
|
||||
* @param precipitation Synced to clients, determines weather effects
|
||||
* @param hasPrecipitation Synced to clients, determines weather effects
|
||||
* @param temperature Synced to clients, affects foliage color, freezing, and weather effects.
|
||||
* Vanilla values are in the range [-0.5, 2.0]
|
||||
* @param temperatureModifier Synced to clients, applies a positional modifier to temperature.
|
||||
@@ -38,14 +38,14 @@ public class ClimateSettingsBuilder
|
||||
* Biomes with downfall > 0.85 count as humid, inhibiting fire spread.
|
||||
* @return a new builder with the given values
|
||||
*/
|
||||
public static ClimateSettingsBuilder create(Precipitation precipitation, float temperature, TemperatureModifier temperatureModifier, float downfall)
|
||||
public static ClimateSettingsBuilder create(boolean hasPrecipitation, float temperature, TemperatureModifier temperatureModifier, float downfall)
|
||||
{
|
||||
return new ClimateSettingsBuilder(precipitation, temperature, temperatureModifier, downfall);
|
||||
return new ClimateSettingsBuilder(hasPrecipitation, temperature, temperatureModifier, downfall);
|
||||
}
|
||||
|
||||
private ClimateSettingsBuilder(Precipitation precipitation, float temperature, TemperatureModifier temperatureModifier, float downfall)
|
||||
private ClimateSettingsBuilder(boolean hasPrecipitation, float temperature, TemperatureModifier temperatureModifier, float downfall)
|
||||
{
|
||||
this.precipitation = precipitation;
|
||||
this.hasPrecipitation = hasPrecipitation;
|
||||
this.temperature = temperature;
|
||||
this.temperatureModifier = temperatureModifier;
|
||||
this.downfall = downfall;
|
||||
@@ -56,23 +56,23 @@ public class ClimateSettingsBuilder
|
||||
*/
|
||||
public ClimateSettings build()
|
||||
{
|
||||
return new ClimateSettings(this.precipitation, this.temperature, this.temperatureModifier, this.downfall);
|
||||
return new ClimateSettings(true, this.temperature, this.temperatureModifier, this.downfall);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Synced to clients, determines weather effects.
|
||||
*/
|
||||
public Precipitation getPrecipitation()
|
||||
public boolean hasPrecipitation()
|
||||
{
|
||||
return precipitation;
|
||||
return hasPrecipitation;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param precipitation Synced to clients, determines weather effects.
|
||||
* @param hasPrecipitation Synced to clients, determines weather effects.
|
||||
*/
|
||||
public void setPrecipitation(Precipitation precipitation)
|
||||
public void setHasPrecipitation(boolean hasPrecipitation)
|
||||
{
|
||||
this.precipitation = precipitation;
|
||||
this.hasPrecipitation = hasPrecipitation;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user