mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-04 00:45:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fabric Enchantments

Browse Source
This commit is contained in:
dfsek 2021-02-25 00:57:36 -07:00
parent 4569a9ed13
commit 924bc6e469
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
View File

@ -272,9 +272,12 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
if(!addonRegistry.loadAll()) { if(!addonRegistry.loadAll()) {
throw new IllegalStateException("Failed to load addons. Please correct addon installations to continue."); throw new IllegalStateException("Failed to load addons. Please correct addon installations to continue.");
} }
logger.info("Loaded addons.");
registry.loadAll(this); registry.loadAll(this);
logger.info("Loaded packs.");
Registry.register(Registry.FEATURE, new Identifier("terra", "flora_populator"), POPULATOR_FEATURE); Registry.register(Registry.FEATURE, new Identifier("terra", "flora_populator"), POPULATOR_FEATURE);
RegistryKey<ConfiguredFeature<?, ?>> floraKey = RegistryKey.of(Registry.CONFIGURED_FEATURE_WORLDGEN, new Identifier("terra", "flora_populator")); RegistryKey<ConfiguredFeature<?, ?>> floraKey = RegistryKey.of(Registry.CONFIGURED_FEATURE_WORLDGEN, new Identifier("terra", "flora_populator"));
Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, floraKey.getValue(), POPULATOR_CONFIGURED_FEATURE); Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, floraKey.getValue(), POPULATOR_CONFIGURED_FEATURE);

8
platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemHandle.java
View File

@ -7,9 +7,11 @@ import com.dfsek.terra.fabric.world.FabricAdapter;
import com.mojang.brigadier.StringReader; import com.mojang.brigadier.StringReader;
import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.command.argument.ItemStackArgumentType; import net.minecraft.command.argument.ItemStackArgumentType;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import java.util.Collections;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
public class FabricItemHandle implements ItemHandle { public class FabricItemHandle implements ItemHandle {
@ -24,11 +26,11 @@ public class FabricItemHandle implements ItemHandle {
@Override @Override
public Enchantment getEnchantment(String id) { public Enchantment getEnchantment(String id) {
return null; return FabricAdapter.adapt(Registry.ENCHANTMENT.get(Identifier.tryParse(id)));
} }
@Override @Override
public Set<Enchantment> getEnchantments() { public Set<Enchantment> getEnchantments() {
return Collections.emptySet(); return Registry.ENCHANTMENT.stream().map(FabricAdapter::adapt).collect(Collectors.toSet());
} }
} }

1
platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/meta/FabricDamageable.java
View File

@ -15,7 +15,6 @@ public class FabricDamageable extends FabricItemMeta implements Damageable {
@Override @Override
public void setDamage(int damage) { public void setDamage(int damage) {
System.out.println("Setting damage: " + damage);
delegate.setDamage(damage); delegate.setDamage(damage);
} }

1
platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/meta/FabricItemMeta.java
View File

@ -36,7 +36,6 @@ public class FabricItemMeta implements ItemMeta {
@Override @Override
public void addEnchantment(Enchantment enchantment, int level) { public void addEnchantment(Enchantment enchantment, int level) {
System.out.println("Enchanting: " + enchantment.getHandle() + ", " + level);
delegate.addEnchantment(FabricAdapter.adapt(enchantment), level); delegate.addEnchantment(FabricAdapter.adapt(enchantment), level);
} }
} }