mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-17 14:21:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fabric cleanup

Browse Source
This commit is contained in:
dfsek
2021-03-10 16:16:11 -07:00
parent d6b5f60b18
commit 819d795c23
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
-1
View File
@@ -173,7 +173,6 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
registry.loadAll(this); // Load all config packs. registry.loadAll(this); // Load all config packs.
PluginCommand c = Objects.requireNonNull(getCommand("terra")); PluginCommand c = Objects.requireNonNull(getCommand("terra"));
//TerraCommand command = new TerraCommand(this); // Set up main Terra command.
CommandManager manager = new TerraCommandManager(this); CommandManager manager = new TerraCommandManager(this);
platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
+3 -4
View File
@@ -359,8 +359,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
try { try {
manager.execute(args.remove(0), FabricAdapter.adapt(context.getSource()), args); manager.execute(args.remove(0), FabricAdapter.adapt(context.getSource()), args);
} catch(CommandException e) { } catch(CommandException e) {
e.printStackTrace(); context.getSource().sendError(new LiteralText(e.getMessage()));
return -1;
} }
return 1; return 1;
}); });
@@ -400,8 +399,8 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
@Global @Global
public void injectTrees(ConfigPackPreLoadEvent event) { public void injectTrees(ConfigPackPreLoadEvent event) {
CheckedRegistry<Tree> treeRegistry = event.getPack().getTreeRegistry(); CheckedRegistry<Tree> treeRegistry = event.getPack().getTreeRegistry();
injectTree(treeRegistry, "BROWN_MUSHROOM", ConfiguredFeatures.BROWN_MUSHROOM_GIANT); injectTree(treeRegistry, "BROWN_MUSHROOM", ConfiguredFeatures.HUGE_BROWN_MUSHROOM);
injectTree(treeRegistry, "RED_MUSHROOM", ConfiguredFeatures.RED_MUSHROOM_GIANT); injectTree(treeRegistry, "RED_MUSHROOM", ConfiguredFeatures.HUGE_RED_MUSHROOM);
injectTree(treeRegistry, "JUNGLE", ConfiguredFeatures.MEGA_JUNGLE_TREE); injectTree(treeRegistry, "JUNGLE", ConfiguredFeatures.MEGA_JUNGLE_TREE);
injectTree(treeRegistry, "JUNGLE_COCOA", ConfiguredFeatures.JUNGLE_TREE); injectTree(treeRegistry, "JUNGLE_COCOA", ConfiguredFeatures.JUNGLE_TREE);
injectTree(treeRegistry, "LARGE_OAK", ConfiguredFeatures.FANCY_OAK); injectTree(treeRegistry, "LARGE_OAK", ConfiguredFeatures.FANCY_OAK);
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldAccess.java
-1
View File
@@ -77,7 +77,6 @@ public class FabricWorldAccess implements World, FabricWorldHandle {
net.minecraft.entity.Entity entity = FabricAdapter.adapt(entityType).create(((ServerWorldAccess) delegate).toServerWorld()); net.minecraft.entity.Entity entity = FabricAdapter.adapt(entityType).create(((ServerWorldAccess) delegate).toServerWorld());
entity.setPos(location.getX(), location.getY(), location.getZ()); entity.setPos(location.getX(), location.getY(), location.getZ());
delegate.spawnEntity(entity); delegate.spawnEntity(entity);
System.out.println("Spawned " + entity);
return new FabricEntity(entity); return new FabricEntity(entity);
} }